janito 1.4.0__py3-none-any.whl → 1.4.1__py3-none-any.whl

janito/__init__.py

@@ -1 +1 @@
-__version__ = "1.4.0"
+__version__ = "1.4.1"

janito/agent/conversation.py

@@ -45,7 +45,13 @@ class ConversationHandler:
             if spinner:
                                 # Calculate word count for all messages
                 word_count = sum(len(str(m.get('content', '')).split()) for m in messages if 'content' in m)
-                spinner_msg = f"[bold green]Waiting for AI response... ({word_count} words in conversation)"
+                def format_count(n):
+                    if n >= 1_000_000:
+                        return f"{n/1_000_000:.1f}m"
+                    elif n >= 1_000:
+                        return f"{n/1_000:.1f}k"
+                    return str(n)
+                spinner_msg = f"[bold green]Waiting for AI response... ({format_count(word_count)} words in conversation)"
                 with console.status(spinner_msg, spinner="dots") as status:
                     response = self.client.chat.completions.create(
                         model=self.model,

janito/agent/tools/fetch_url.py

@@ -8,7 +8,7 @@ from janito.agent.tools.tool_base import ToolBase
 class FetchUrlTool(ToolBase):
     """Fetch the content of a web page and extract its text."""
     def call(self, url: str, search_strings: list[str] = None) -> str:
-        print_info(f"🌐 Fetching URL: {url} ... ")
+        print_info(f"🌐 Fetching URL: {url} ... ", end="")
         response = requests.get(url, timeout=10)
         response.raise_for_status()
         self.update_progress(f"Fetched URL with status {response.status_code}")
@@ -29,7 +29,7 @@ class FetchUrlTool(ToolBase):
             else:
                 text = "No matches found for the provided search strings."
 
-        print_success("\u2705 Success")
+        print_success("✅ Success")
         return text
 
 ToolHandler.register_tool(FetchUrlTool, name="fetch_url")

janito/agent/tools/file_ops.py

@@ -31,11 +31,11 @@ class CreateFileTool(ToolBase):
                 old_lines = sum(1 for _ in f)
         with open(path, "w", encoding="utf-8") as f:
             f.write(content)
-        print_success("✅ Success")
+        new_lines = content.count('\n') + 1 if content else 0
         if old_lines is not None:
-            new_lines = content.count('\n') + 1 if content else 0
+            print_success(f"✅ Successfully updated the file at '{disp_path}' ({old_lines} > {new_lines} lines).")
             return f"✅ Successfully updated the file at '{disp_path}' ({old_lines} > {new_lines} lines)."
-        new_lines = content.count('\n') + 1 if content else 0
+        print_success(f"✅ Successfully created the file at '{disp_path}' ({new_lines} lines).")
         return f"✅ Successfully created the file at '{disp_path}' ({new_lines} lines)."
 
 class CreateDirectoryTool(ToolBase):
@@ -58,57 +58,3 @@ class CreateDirectoryTool(ToolBase):
             if not os.path.isdir(path):
                 print_error(f"❌ Path '{disp_path}' exists and is not a directory.")
                 return f"❌ Path '{disp_path}' exists and is not a directory."
-            if not overwrite:
-                print_error(f"❗ Directory '{disp_path}' already exists and overwrite is False.")
-                return f"❗ Directory '{disp_path}' already exists and overwrite is False."
-            # Remove existing directory if overwrite is True
-            shutil.rmtree(path)
-            print_info(f"🗑️  Removed existing directory: '{disp_path}'")
-        os.makedirs(path, exist_ok=True)
-        print_success(f"✅ Created directory: '{disp_path}'")
-        return f"✅ Successfully created directory at '{disp_path}'."
-
-class RemoveFileTool(ToolBase):
-    """
-    Remove a file at the specified path.
-    """
-    def call(self, path: str) -> str:
-        original_path = path
-        path = expand_path(path)
-        disp_path = display_path(original_path, path)
-        print_info(f"🗑️  Removing file: '{disp_path}' ... ")
-        os.remove(path)
-        print_success("✅ Success")
-        return f"✅ Successfully deleted the file at '{disp_path}'."
-
-class MoveFileTool(ToolBase):
-    """
-    Move or rename a file from source to destination.
-    """
-    def call(self, source_path: str, destination_path: str, overwrite: bool = False) -> str:
-        orig_source = source_path
-        orig_dest = destination_path
-        source_path = expand_path(source_path)
-        destination_path = expand_path(destination_path)
-        disp_source = display_path(orig_source, source_path)
-        disp_dest = display_path(orig_dest, destination_path)
-        print_info(f"🚚 Moving '{disp_source}' to '{disp_dest}' ... ")
-        if not os.path.exists(source_path):
-            print_error(f"❌ Error: source does not exist")
-            return f"❌ Source path '{disp_source}' does not exist."
-        if os.path.exists(destination_path):
-            if not overwrite:
-                print_error(f"❗ Error: destination exists and overwrite is False")
-                return f"❗ Destination path '{disp_dest}' already exists and overwrite is False."
-            if os.path.isdir(destination_path):
-                print_error(f"❌ Error: destination is a directory")
-                return f"❌ Destination path '{disp_dest}' is an existing directory."
-        shutil.move(source_path, destination_path)
-        print_success("✅ Success")
-        return f"✅ Successfully moved '{disp_source}' to '{disp_dest}'."
-
-# register tools
-ToolHandler.register_tool(CreateFileTool, name="create_file")
-ToolHandler.register_tool(CreateDirectoryTool, name="create_directory")
-ToolHandler.register_tool(RemoveFileTool, name="remove_file")
-ToolHandler.register_tool(MoveFileTool, name="move_file")

janito/agent/tools/find_files.py

@@ -15,7 +15,7 @@ class FindFilesTool(ToolBase):
             return os.path.relpath(path)
         disp_path = _display_path(directory)
         rec = "recursively" if recursive else "non-recursively"
-        print_info(f"\U0001F50D Searching '{disp_path}' for pattern '{pattern}' ({rec}, max {max_results})")
+        print_info(f"\U0001F50D Searching '{disp_path}' for pattern '{pattern}' ({rec}, max {max_results})", end="")
         self.update_progress(f"Searching for files in {directory} matching {pattern}")
         matches = []
         for root, dirs, files in os.walk(directory):

janito/agent/tools/get_file_outline.py

@@ -6,14 +6,15 @@ from janito.agent.tools.rich_utils import print_info, print_success, print_error
 class GetFileOutlineTool(ToolBase):
     """Get an outline of a file's structure."""
     def call(self, file_path: str) -> str:
-        print_info(f"📄 Getting outline for: {file_path}")
+        print_info(f"\U0001F4C4 Getting outline for: {file_path}", end="")
         self.update_progress(f"Getting outline for: {file_path}")
         try:
             with open(file_path, 'r', encoding='utf-8') as f:
                 lines = f.readlines()
             outline = [line.strip() for line in lines if line.strip()]
-            print_success(f"\u2705 Outline generated for {file_path}")
-            return '\n'.join(outline)
+            num_items = len(outline)
+            print_success(f"✅ Outline generated ({num_items} items)")
+            return f"Outline: {num_items} items\n" + '\n'.join(outline)
         except Exception as e:
             print_error(f"\u274c Error reading file: {e}")
             return f"Error reading file: {e}"

janito/agent/tools/get_lines.py

@@ -28,6 +28,9 @@ class GetLinesTool(ToolBase):
                 print_success(f" ✅ {len(lines)} lines read")
             return ''.join(selected)
         except Exception as e:
+            if isinstance(e, FileNotFoundError):
+                print_error(f"❗ not found")
+                return "❗ not found"
             print_error(f" ❌ Error: {e}")
             return f"Error reading file: {e}"
 

janito/agent/tools/py_compile.py

@@ -7,7 +7,7 @@ import py_compile
 class PyCompileTool(ToolBase):
     """Validate a Python file by compiling it with py_compile."""
     def call(self, file_path: str, doraise: Optional[bool] = True) -> str:
-        print_info(f"[py_compile] Compiling Python file: {file_path}")
+        print_info(f"[py_compile] Compiling Python file: {file_path}", end="")
         self.update_progress(f"Compiling Python file: {file_path}")
         try:
             py_compile.compile(file_path, doraise=doraise)

janito/agent/tools/python_exec.py

@@ -31,7 +31,7 @@ class PythonExecTool(ToolBase):
         str: Formatted stdout, stderr, and return code.
     """
     def call(self, code: str) -> str:
-        print_info(f"🐍 Executing Python code ...")
+        print_info(f"🐍 Executing Python code ...", end="")
         print_info(code)
         self.update_progress("Starting Python code execution...")
         result_queue = multiprocessing.Queue()
@@ -45,7 +45,7 @@ class PythonExecTool(ToolBase):
         self.update_progress(f"Python code execution completed with return code: {result['returncode']}")
         if result['returncode'] == 0:
             from janito.agent.tools.rich_utils import print_success
-            print_success(f"\u2705 Python code executed successfully.")
+            print_success(f"✅ Python code executed successfully.")
         else:
             from janito.agent.tools.rich_utils import print_error
             print_error(f"\u274c Python code execution failed with return code {result['returncode']}")

janito/agent/tools/remove_directory.py

@@ -8,14 +8,14 @@ from janito.agent.tools.rich_utils import print_info, print_success, print_error
 class RemoveDirectoryTool(ToolBase):
     """Remove a directory. If recursive=False and directory not empty, raises error."""
     def call(self, directory: str, recursive: bool = False) -> str:
-        print_info(f"🗃️ Removing directory: {directory} (recursive={recursive})")
+        print_info(f"🗃️ Removing directory: {directory} (recursive={recursive})", end="")
         self.update_progress(f"Removing directory: {directory} (recursive={recursive})")
         try:
             if recursive:
                 shutil.rmtree(directory)
             else:
                 os.rmdir(directory)
-            print_success(f"\u2705 Directory removed: {directory}")
+            print_success(f"✅ Directory removed: {directory}")
             return f"Directory removed: {directory}"
         except Exception as e:
             print_error(f"\u274c Error removing directory: {e}")

janito/agent/tools/search_files.py

@@ -7,7 +7,7 @@ from janito.agent.tools.rich_utils import print_info, print_success
 class SearchFilesTool(ToolBase):
     """Search for a text pattern in all files within a directory and return matching lines."""
     def call(self, directory: str, pattern: str) -> str:
-        print_info(f"🔎 Searching for pattern '{pattern}' in directory {directory}")
+        print_info(f"🔎 Searching for pattern '{pattern}' in directory {directory}", end="")
         self.update_progress(f"Searching for pattern '{pattern}' in directory {directory}")
         matches = []
         for root, dirs, files in os.walk(directory):
@@ -20,7 +20,7 @@ class SearchFilesTool(ToolBase):
                                 matches.append(f"{path}:{lineno}: {line.strip()}")
                 except Exception:
                     continue
-        print_success(f"\u2705 {len(matches)} matches found")
+        print_success(f"✅ {len(matches)} matches found")
         return '\n'.join(matches)
 
 ToolHandler.register_tool(SearchFilesTool, name="search_files")

{janito-1.4.0.dist-info → janito-1.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: janito
-Version: 1.4.0
+Version: 1.4.1
 Summary: A Natural Programming Language Agent,
 Author-email: João Pinto <joao.pinto@gmail.com>
 License: MIT
@@ -8,7 +8,6 @@ Project-URL: homepage, https://github.com/joaompinto/janito
 Project-URL: repository, https://github.com/joaompinto/janito
 Keywords: agent,framework,tools,automation
 Classifier: Programming Language :: Python :: 3.10
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown

{janito-1.4.0.dist-info → janito-1.4.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-janito/__init__.py,sha256=-pa9pj_zJgPDZtE3ena4mjuVS3FEWQWYij1shjLYS80,23
+janito/__init__.py,sha256=nxjQ6mMSJJKqkpX2IY-1BmdpErEa1Lx5hYzk9ULB09w,23
 janito/__main__.py,sha256=CBScR30Tm-vuhIJM8o5HXKr0q-smICiwSVyuU68BP8U,78
 janito/render_prompt.py,sha256=xCQgYRqMyz9Pzi7096NoZfC4lFiKEHEaXiTYP6ByViY,513
 janito/agent/__init__.py,sha256=CByAH5Yk-yH64zo0RU7Z3nsn_7Vmandphqk0JNlpyj8,21
@@ -6,27 +6,27 @@ janito/agent/agent.py,sha256=X5swt-SUKnIxrSQaGfhxPk61M-BXREz4n02ynE0dVVU,4245
 janito/agent/config.py,sha256=Z-_IeWxJB_1ca5LVR7PtHChZgc5eAsgegyEmVAxr1NY,4472
 janito/agent/config_defaults.py,sha256=vSif3tJYZ7pMHaNqH6jGb7EKctfE-Kt8ueD17sC0ESY,395
 janito/agent/config_utils.py,sha256=UmvR236wDrMc-aTy9LxVbop6YeoJaaPb1d2DBMlkSRg,254
-janito/agent/conversation.py,sha256=vbCL-1LlJjKRN6q3CjfSe4ENGplP-YQKsAEA1uX3RWU,6184
+janito/agent/conversation.py,sha256=Ih1brlxJ4m3LZS99gqgH9XK2ohTSLPOurCqd0RqCXm8,6453
 janito/agent/queued_tool_handler.py,sha256=THPymKXnpoXfN49EhW5b4hrwpWZZup73JKFDJ_U03tI,540
 janito/agent/runtime_config.py,sha256=H6bnRVYR0zC-WhmLpBU-IXikXWKcIiBQqFnc4uGooj4,908
 janito/agent/tool_handler.py,sha256=h-pxG1lhyIJohZmvwHSsknBSonrJQYGGzBL6Tobgmrg,7414
 janito/agent/templates/system_instructions.j2,sha256=BtwMcibxnwZmQhGN7p_VGhhyAPzCfqksnW4B-PTWa-8,1532
 janito/agent/tools/__init__.py,sha256=Vv1oWF6Ur-Tkm3p0KCz5HD7wwar9rUHtY596NGPnn2s,378
 janito/agent/tools/ask_user.py,sha256=C1YC_gr0kh3-7vw2PgdIi4D8Paw-eNGpaWQy4HD3Gmo,2180
-janito/agent/tools/fetch_url.py,sha256=XUHEex1An1Ql4p8H1UKWzaIxo9a6WkZC4uRPkhBQHeU,1418
-janito/agent/tools/file_ops.py,sha256=5FnggSPv-Tsgq038T1YK5bpJZE5kPY_biB5fXZg48X0,5476
-janito/agent/tools/find_files.py,sha256=jq55uUSfAUJ2gmJ29YQmo8XZ92cptb2C5hpc_pjbrQg,1364
-janito/agent/tools/get_file_outline.py,sha256=aLNNWMalvE-3CXLEuBVe4ihDMciP4grbsol6Yw01O44,959
-janito/agent/tools/get_lines.py,sha256=0Yg6JFPAOCJuR7HYcFIGwn83BCv_SnuWp0T7v4RtT9Q,1555
+janito/agent/tools/fetch_url.py,sha256=UZ9lv0Ko88eDeu6gvEqqPQ5Yug2aBb1NawaoFAIte8Y,1423
+janito/agent/tools/file_ops.py,sha256=qdcroy6aE0f4ZZERgbFEsxkzc0yJZAvlhtFl_6JIEaM,2884
+janito/agent/tools/find_files.py,sha256=unw82GwaNa6_2kKD2wTzJ9r66-j_FHboi2W3bfCMAaw,1372
+janito/agent/tools/get_file_outline.py,sha256=OUJui1oxKkQUDtGaIHAK-u8xG60Vv8VvO_Idy-7xr6k,1046
+janito/agent/tools/get_lines.py,sha256=QoJGgINpghe87i6j20UhBGPa9rFI1DHEojh8PR1e_ek,1692
 janito/agent/tools/gitignore_utils.py,sha256=z_IYilabTD_-c14aRxuVasojOzTsg-11xJPJqudWIKA,1306
-janito/agent/tools/py_compile.py,sha256=y8f48WaHpsPFCt1Ksi-JEVbFxWvZU-lQzCHsR796pWg,1099
-janito/agent/tools/python_exec.py,sha256=TPU1LvRNNJMpsyhy1kD8pe2go5V2fheD93HBjKrXrFM,2188
-janito/agent/tools/remove_directory.py,sha256=xcyGyF5vC_AU7dzIVNa65aYUYuF5mBjGZ2MwnLsLafs,1076
+janito/agent/tools/py_compile.py,sha256=fYGR6zRepmV7uHExOEaa61Fr7IdnY7a7HOhtFJ-xnzY,1107
+janito/agent/tools/python_exec.py,sha256=R8PenQliPTdNEazvuW6bW4MYioO9Q46oAMJK-hg3qTI,2193
+janito/agent/tools/remove_directory.py,sha256=UvtTd3pxKRQ2I4hyFBBuOORz2OygvlMgM8akeMHvwSw,1081
 janito/agent/tools/replace_text_in_file.py,sha256=eO7YumsT8Eq3_SOgl5DW_k9vhXO7egyMaiB6ZgtiHRU,3894
 janito/agent/tools/rich_live.py,sha256=cuZ3-ZxpuHxR1TvIcp0bi9F3QM1M6Ms0XiOMd8If8gU,1161
 janito/agent/tools/rich_utils.py,sha256=Lc4phM4DUG-eiiub2PFThc6pBk5aOo_6f09JPdZIdsk,894
 janito/agent/tools/run_bash_command.py,sha256=rKAx_n6xxpHeBzDg_7BVkAjMgPGiXVLpjx6i2o1lMb0,3883
-janito/agent/tools/search_files.py,sha256=ejHDp_I-GGQPucAKcXLgVO3LFPiOXNS77tEHME9QsvQ,1250
+janito/agent/tools/search_files.py,sha256=h6-7DsWdrvzBhBWE0NkmELV0ZzO8Dme1kmfOgYL3x9Y,1255
 janito/agent/tools/tool_base.py,sha256=nS2FXSw3YY6gJiKh-l1m1udnHT7F3yKwGpGHJHfERbY,836
 janito/agent/tools/utils.py,sha256=cKZ2qxK-S01mzBmCXYWwQ9zOyT994SaoRZYbD1o57Dk,1113
 janito/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -47,9 +47,9 @@ janito/cli_chat_shell/ui.py,sha256=9IngH8HFherjatfa9Eu37jb4b2gOP0lsgcUhbnQKCZA,5
 janito/web/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 janito/web/__main__.py,sha256=oPXNF332aCeI7aUWr7_8M57oOKugw422VrEubxFp0P4,354
 janito/web/app.py,sha256=stogs_HaM-axsWTwoiVma9M46Y8dMu0QRjopsekRjQs,6622
-janito-1.4.0.dist-info/licenses/LICENSE,sha256=sHBqv0bvtrb29H7WRR-Z603YHm9pLtJIo3nHU_9cmgE,1091
-janito-1.4.0.dist-info/METADATA,sha256=_rNaRL-V53vjwrWJVJmgfz5XqRvekKr-Ju2bhi9G7FE,9114
-janito-1.4.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-janito-1.4.0.dist-info/entry_points.txt,sha256=wIo5zZxbmu4fC-ZMrsKD0T0vq7IqkOOLYhrqRGypkx4,48
-janito-1.4.0.dist-info/top_level.txt,sha256=m0NaVCq0-ivxbazE2-ND0EA9Hmuijj_OGkmCbnBcCig,7
-janito-1.4.0.dist-info/RECORD,,
+janito-1.4.1.dist-info/licenses/LICENSE,sha256=sHBqv0bvtrb29H7WRR-Z603YHm9pLtJIo3nHU_9cmgE,1091
+janito-1.4.1.dist-info/METADATA,sha256=NzxCNDao3CIqAETg4KZb0wTBnVD5Ne9T2jrN90zcFFk,9062
+janito-1.4.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+janito-1.4.1.dist-info/entry_points.txt,sha256=wIo5zZxbmu4fC-ZMrsKD0T0vq7IqkOOLYhrqRGypkx4,48
+janito-1.4.1.dist-info/top_level.txt,sha256=m0NaVCq0-ivxbazE2-ND0EA9Hmuijj_OGkmCbnBcCig,7
+janito-1.4.1.dist-info/RECORD,,