PraisonAI 0.0.52__py3-none-any.whl → 0.0.54__py3-none-any.whl

praisonai/deploy.py

@@ -56,7 +56,7 @@ class CloudDeployer:
             file.write("FROM python:3.11-slim\n")
             file.write("WORKDIR /app\n")
             file.write("COPY . .\n")
-            file.write("RUN pip install flask praisonai==0.0.52 gunicorn markdown\n")
+            file.write("RUN pip install flask praisonai==0.0.54 gunicorn markdown\n")
             file.write("EXPOSE 8080\n")
             file.write('CMD ["gunicorn", "-b", "0.0.0.0:8080", "api:app"]\n')
             

praisonai/ui/context.py

@@ -2,7 +2,9 @@ import os
 import fnmatch
 import re
 import yaml
+from pathlib import Path
 import logging
+
 # Set up logging
 logger = logging.getLogger(__name__)
 log_level = os.getenv("LOGLEVEL", "INFO").upper()
@@ -24,111 +26,103 @@ class ContextGatherer:
         self.directory = directory
         self.output_file = output_file
         self.relevant_extensions = relevant_extensions or [
-            '.py',       # Python
-            '.js',       # JavaScript
-            '.ts',       # TypeScript
-            '.java',     # Java
-            '.rb',       # Ruby
-            '.php',      # PHP
-            '.pl',       # Perl
-            '.pm',       # Perl Module
-            '.c',        # C
-            '.h',        # C Header
-            '.cpp',      # C++
-            '.hpp',      # C++ Header
-            '.cs',       # C#
-            '.vb',       # Visual Basic
-            '.swift',    # Swift
-            '.kt',       # Kotlin
-            '.m',        # Objective-C
-            '.mm',       # Objective-C++
-            '.go',       # Go
-            '.rs',       # Rust
-            '.hs',       # Haskell
-            '.r',        # R
-            '.lua',      # Lua
-            '.sh',       # Shell Script
-            '.bat',      # Batch File
-            '.clj',      # Clojure
-            '.scala',    # Scala
-            '.erl',      # Erlang
-            '.ex',       # Elixir
-            '.ml',       # OCaml
-            '.fs',       # F#
-            '.groovy',   # Groovy
-            '.jsm',      # JavaScript Module
-            '.jsx',      # JavaScript XML
-            '.tsx',      # TypeScript XML
-            '.yaml',     # YAML
+            '.py', '.js', '.ts', '.java', '.rb', '.php', '.pl', '.pm', '.c', '.h',
+            '.cpp', '.hpp', '.cs', '.vb', '.swift', '.kt', '.m', '.mm', '.go', '.rs',
+            '.hs', '.r', '.lua', '.sh', '.bat', '.clj', '.scala', '.erl', '.ex',
+            '.ml', '.fs', '.groovy', '.jsm', '.jsx', '.tsx', '.yaml'
         ]
         self.max_file_size = max_file_size
         self.max_tokens = int(os.getenv("PRAISONAI_MAX_TOKENS", max_tokens))
         self.ignore_patterns = self.get_ignore_patterns()
 
     def get_ignore_patterns(self):
-        """Read .gitignore file and return ignore patterns."""
-        
-        # 1. Check for .praisonignore
-        praisonignore_path = os.path.join(self.directory, '.praisonignore')
-        if os.path.exists(praisonignore_path):
-            with open(praisonignore_path, 'r') as f:
-                praisonignore_patterns = [line.strip() for line in f if line.strip() and not line.startswith('#')]
-            logger.debug(f"Using ignore patterns from .praisonignore: {praisonignore_patterns}")
-            return praisonignore_patterns
-
-        # 2. Fallback to settings.yaml
+        """
+        Loads ignore patterns from various sources, prioritizing them in 
+        the following order:
+            1. .praisonignore
+            2. settings.yaml (under code.ignore_files)
+            3. PRAISONAI_IGNORE_FILES environment variable
+            4. .gitignore
+            5. Default patterns
+        """
+        ignore_patterns = []
+
+        def load_from_file(filepath):
+            if os.path.exists(filepath):
+                with open(filepath, 'r') as f:
+                    ignore_patterns.extend(
+                        line.strip() for line in f 
+                        if line.strip() and not line.startswith('#')
+                    )
+
+        # 1. Load from .praisonignore
+        load_from_file(os.path.join(self.directory, '.praisonignore'))
+
+        # 2. Load from settings.yaml
         settings_path = os.path.join(self.directory, 'settings.yaml')
         if os.path.exists(settings_path):
             with open(settings_path, 'r') as f:
                 settings = yaml.safe_load(f)
                 if 'code' in settings and 'ignore_files' in settings['code']:
-                    logger.debug(f"Using ignore patterns from settings.yaml: {settings['code']['ignore_files']}")
-                    return settings['code']['ignore_files']
+                    ignore_patterns.extend(settings['code']['ignore_files'])
 
-        # 3. Fallback to PRAISONAI_IGNORE_FILES env variable
+        # 3. Load from environment variable
         ignore_files_env = os.getenv("PRAISONAI_IGNORE_FILES")
         if ignore_files_env:
-            logger.debug(f"Using ignore patterns from PRAISONAI_IGNORE_FILES: {ignore_files_env}")
-            return ignore_files_env.split(",")
-                
-        default_patterns = [".*", "*.pyc", "__pycache__", ".git", ".gitignore", ".vscode",
-                            ".idea", ".DS_Store", "*.lock", "*.pyc", ".env",
-                            "docs", "tests", "test", "tmp", "temp", 
-                            "*.txt", "*.md", "*.json", "*.csv", "*.tsv","public",
-                            "*.sql", "*.sqlite", "*.db", "*.db3", "*.sqlite3", "*.log", "*.zip", "*.gz",
-                            "*.tar", "*.rar", "*.7z", "*.pdf", "*.jpg", "*.jpeg", "*.png", "*.gif", "*.svg",
-                            "cookbooks", "assets", "__pycache__", "dist", "build", "node_modules", "venv",]
-        gitignore_path = os.path.join(self.directory, '.gitignore')
-        if os.path.exists(gitignore_path):
-            with open(gitignore_path, 'r') as f:
-                gitignore_patterns = [line.strip() for line in f if line.strip() and not line.startswith('#')]
-            logger.debug(f"Ignored gitignore and default files: {ignore_files_env}")
-            return list(set(default_patterns + gitignore_patterns))
-        return default_patterns
+            ignore_patterns.extend(ignore_files_env.split(","))
+
+        # 4. Load from .gitignore
+        load_from_file(os.path.join(self.directory, '.gitignore'))
+
+        # 5. Default patterns (only if no patterns loaded from above sources)
+        if not ignore_patterns:
+            ignore_patterns = [
+                ".*", "*.pyc", "__pycache__", ".git", ".gitignore", ".vscode",
+                ".idea", ".DS_Store", "*.lock", "*.pyc", ".env", "docs", "tests", 
+                "test", "tmp", "temp", "*.txt", "*.md", "*.json", "*.csv", "*.tsv",
+                "public", "*.sql", "*.sqlite", "*.db", "*.db3", "*.sqlite3", 
+                "*.log", "*.zip", "*.gz", "*.tar", "*.rar", "*.7z", "*.pdf", 
+                "*.jpg", "*.jpeg", "*.png", "*.gif", "*.svg", "cookbooks", 
+                "assets", "__pycache__", "dist", "build", "node_modules", "venv"
+            ]
+            logger.debug(f"Using default ignore patterns: {ignore_patterns}")
+
+        # Modify patterns to match directories and add leading '*' if necessary
+        modified_ignore_patterns = [
+            '*' + pattern if not pattern.startswith('.') and not pattern.startswith('*') else pattern
+            for pattern in ignore_patterns
+        ]
+        logger.debug(f"Final ignore patterns: {modified_ignore_patterns}")
+        return modified_ignore_patterns
 
     def should_ignore(self, file_path):
-        """Check if a file should be ignored based on patterns."""
+        """
+        Check if a file or directory should be ignored based on patterns.
+        Handles both file names and directory names for more comprehensive filtering.
+        """
         relative_path = os.path.relpath(file_path, self.directory)
         if relative_path.startswith('.'):
             return True
         for pattern in self.ignore_patterns:
-            if fnmatch.fnmatch(relative_path, pattern):
+            if fnmatch.fnmatch(relative_path, pattern) or \
+               fnmatch.fnmatch(os.path.basename(file_path), pattern):
                 return True
         return False
 
     def is_relevant_file(self, file_path):
         """Determine if a file is relevant for the context."""
-        if os.path.getsize(file_path) > self.max_file_size:
-            return False
-        return any(file_path.endswith(ext) for ext in self.relevant_extensions)
+        return os.path.isfile(file_path) and \
+               os.path.getsize(file_path) <= self.max_file_size and \
+               any(file_path.endswith(ext) for ext in self.relevant_extensions)
 
     def gather_context(self):
-        """Gather context from relevant files in the directory."""
+        """Gather context from relevant files, respecting ignore patterns."""
         context = []
-        total_files = sum(len(files) for _, _, files in os.walk(self.directory))
+        total_files = 0
         processed_files = 0
 
         for root, dirs, files in os.walk(self.directory):
+            total_files += len(files) 
             dirs[:] = [d for d in dirs if not self.should_ignore(os.path.join(root, d))]
             for file in files:
                 file_path = os.path.join(root, file)
@@ -138,57 +132,54 @@ class ContextGatherer:
                             content = f.read()
                             context.append(f"File: {file_path}\n\n{content}\n\n{'='*50}\n")
                     except Exception as e:
-                        print(f"Error reading {file_path}: {e}")
+                        logger.error(f"Error reading {file_path}: {e}")
                 processed_files += 1
                 print(f"\rProcessed {processed_files}/{total_files} files", end="", flush=True)
         print()  # New line after progress indicator
         return '\n'.join(context)
 
     def count_tokens(self, text):
-        """Count the number of tokens in the given text using a simple tokenizer."""
-        # Split on whitespace and punctuation
-        tokens = re.findall(r'\b\w+\b|[^\w\s]', text)
-        return len(tokens)
+        """Count tokens using a simple whitespace-based tokenizer."""
+        return len(text.split()) 
 
     def truncate_context(self, context):
-        """Truncate context to fit within the specified token limit."""
-        tokens = re.findall(r'\b\w+\b|[^\w\s]', context)
+        """Truncate context to stay within the token limit."""
+        tokens = context.split()
         if len(tokens) > self.max_tokens:
-            truncated_tokens = tokens[:self.max_tokens]
-            return ' '.join(truncated_tokens)
+            truncated_context = ' '.join(tokens[:self.max_tokens])
+            logger.warning("Context truncated due to token limit.")
+            return truncated_context
         return context
 
     def save_context(self, context):
         """Save the gathered context to a file."""
         with open(self.output_file, 'w', encoding='utf-8') as f:
             f.write(context)
-            
+
     def get_context_tree(self):
-        """Generate a formatted tree structure of the folder, including only relevant files."""
+        """Generate a formatted tree structure of included files and folders."""
         tree = []
-        start_dir = os.path.abspath(self.directory)
-        
+        start_dir = Path(self.directory)
+
         def add_to_tree(path, prefix=''):
-            contents = sorted(os.listdir(path))
+            contents = sorted(path.iterdir())
             pointers = [('└── ' if i == len(contents) - 1 else '├── ') for i in range(len(contents))]
-            for pointer, name in zip(pointers, contents):
-                full_path = os.path.join(path, name)
-                if self.should_ignore(full_path):
+            for pointer, item in zip(pointers, contents):
+                # Use should_ignore for consistency
+                if self.should_ignore(item):
                     continue
-                
-                rel_path = os.path.relpath(full_path, start_dir)
-                tree.append(f"{prefix}{pointer}{name}")
-                
-                if os.path.isdir(full_path):
-                    add_to_tree(full_path, prefix + ('    ' if pointer == '└── ' else '│   '))
-                elif self.is_relevant_file(full_path):
-                    continue  # We've already added the file to the tree
+
+                rel_path = item.relative_to(start_dir)
+                tree.append(f"{prefix}{pointer}{rel_path}")
+
+                if item.is_dir():
+                    add_to_tree(item, prefix + ('    ' if pointer == '└── ' else '│   '))
 
         add_to_tree(start_dir)
         return '\n'.join(tree)
 
     def run(self):
-        """Run the context gathering process and return the context and token count."""
+        """Execute the context gathering, truncation, and reporting."""
         context = self.gather_context()
         context = self.truncate_context(context)
         token_count = self.count_tokens(context)
@@ -200,17 +191,11 @@ class ContextGatherer:
         return context, token_count, context_tree
 
 def main():
-    gatherer = ContextGatherer(
-        directory='.',
-        output_file='context.txt',
-        relevant_extensions=['.py'],
-        max_file_size=500_000,  # 500KB
-        max_tokens=60000
-    )
+    gatherer = ContextGatherer()
     context, token_count, context_tree = gatherer.run()
     print(f"\nThe context contains approximately {token_count} tokens.")
     print("First 500 characters of context:")
     print(context[:500] + "...")
 
 if __name__ == "__main__":
-    main()
+    main()

{praisonai-0.0.52.dist-info → praisonai-0.0.54.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PraisonAI
-Version: 0.0.52
+Version: 0.0.54
 Summary: PraisonAI application combines AutoGen and CrewAI or similar frameworks into a low-code solution for building and managing multi-agent LLM systems, focusing on simplicity, customization, and efficient human-agent collaboration.
 Author: Mervin Praison
 Requires-Python: >=3.10,<3.13
@@ -19,12 +19,12 @@ Provides-Extra: gradio
 Provides-Extra: openai
 Provides-Extra: ui
 Requires-Dist: agentops (>=0.2.6) ; extra == "agentops"
-Requires-Dist: aiosqlite (>=0.20.0) ; extra == "code"
+Requires-Dist: aiosqlite (>=0.20.0) ; extra == "chat" or extra == "code"
 Requires-Dist: chainlit (>=1.1.301,<2.0.0) ; extra == "ui" or extra == "chat" or extra == "code"
 Requires-Dist: crewai (>=0.32.0)
 Requires-Dist: flask (>=3.0.0) ; extra == "api"
 Requires-Dist: gradio (>=4.26.0) ; extra == "gradio"
-Requires-Dist: greenlet (>=3.0.3) ; extra == "code"
+Requires-Dist: greenlet (>=3.0.3) ; extra == "chat" or extra == "code"
 Requires-Dist: langchain-anthropic (>=0.1.13) ; extra == "anthropic"
 Requires-Dist: langchain-cohere (>=0.1.4) ; extra == "cohere"
 Requires-Dist: langchain-google-genai (>=1.0.4) ; extra == "google"
@@ -61,6 +61,16 @@ Description-Content-Type: text/markdown
 
 Praison AI, leveraging both AutoGen and CrewAI or any other agent framework, represents a low-code, centralised framework designed to simplify the creation and orchestration of multi-agent systems for various LLM applications, emphasizing ease of use, customization, and human-agent interaction.
 
+<div align="center">
+  <picture>
+    <source media="(prefers-color-scheme: dark)" srcset="docs/images/architecture-dark.png">
+    <source media="(prefers-color-scheme: light)" srcset="docs/images/architecture-light.png">
+    <img alt="PraisonAI Architecture" src="docs/images/architecture-light.png">
+  </picture>
+</div>
+
+## Google Colab
+
 |               | Cookbook        | Open in Colab                                                                                                                                                                                                                                  |
 | ------------- | --------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | Basic         | PraisonAI       | <a target="_blank" href="https://colab.research.google.com/github/MervinPraison/PraisonAI/blob/main/cookbooks/praisonai-googlecolab.ipynb"><img src="https://colab.research.google.com/assets/colab-badge.svg" alt="Open In Colab"/></a>       |
@@ -75,6 +85,14 @@ praisonai --init create a movie script about dog in moon
 praisonai
 ```
 
+## Different User Interfaces:
+
+| Interface | Description | URL |
+|---|---|---|
+| **UI** | Multi Agents such as CrewAI or AutoGen | [https://docs.praison.ai/ui/ui](https://docs.praison.ai/ui/ui) |
+| **Chat** | Chat with 100+ LLMs, single AI Agent | [https://docs.praison.ai/ui/chat](https://docs.praison.ai/ui/chat) |
+| **Code** | Chat with entire Codebase, single AI Agent | [https://docs.praison.ai/ui/code](https://docs.praison.ai/ui/code) |
+
 ## Table of Contents
 
 - [Installation](#installation)

{praisonai-0.0.52.dist-info → praisonai-0.0.54.dist-info}/RECORD

@@ -4,7 +4,7 @@ praisonai/agents_generator.py,sha256=8d1WRbubvEkBrW1HZ7_xnGyqgJi0yxmXa3MgTIqef1c
 praisonai/auto.py,sha256=9spTXqj47Hmmqv5QHRYE_RzSVHH_KoPbaZjskUj2UcE,7895
 praisonai/chainlit_ui.py,sha256=bNR7s509lp0I9JlJNvwCZRUZosC64qdvlFCt8NmFamQ,12216
 praisonai/cli.py,sha256=VaVEJlc8c_aE2SBY6xN7WIbHrqNcXGR2xrDzFAsD2B8,14504
-praisonai/deploy.py,sha256=TZUQmMCRG9qZY34GBdd8BJ8Aaaiac2AcNOr3N4y4OdM,6028
+praisonai/deploy.py,sha256=H7UzS6kqr9MBhow4-Ah5rqOukKs2pBuBR8SkaCpcwDw,6028
 praisonai/inbuilt_tools/__init__.py,sha256=mUKnbL6Gram9c9f2m8wJwEzURBLmPEOcHzwySBH89YA,74
 praisonai/inbuilt_tools/autogen_tools.py,sha256=svYkM2N7DVFvbiwgoAS7U_MqTOD8rHf8VD3BaFUV5_Y,14907
 praisonai/inc/__init__.py,sha256=sPDlYBBwdk0VlWzaaM_lG0_LD07lS2HRGvPdxXJFiYg,62
@@ -24,7 +24,7 @@ praisonai/public/thriller.svg,sha256=2dYY72EcgbEyTxS4QzjAm37Y4srtPWEW4vCMFki98ZI
 praisonai/test.py,sha256=RZKq3UEFb6AnFFiHER3zBXfNmlteSLBlrTmOvnpnZLo,4092
 praisonai/ui/chat.py,sha256=S3a5u0mI7RO5QFbKckz4z8b32gRTiX8kauSHvQBTMco,9238
 praisonai/ui/code.py,sha256=KLJir8sfzNnZRm2mlAVprGBsZ6wId6yDLsSfN3A2Qdk,10012
-praisonai/ui/context.py,sha256=-iAYzhQ4zOdhYdM5VgKEFQmHIQSCiTazReJs_51mHfE,9445
+praisonai/ui/context.py,sha256=4Rn0BZg9IKMtkKk3s784dStvbMMogW8fMU4xb1gQ9dY,8484
 praisonai/ui/public/fantasy.svg,sha256=4Gs3kIOux-pjGtw6ogI_rv5_viVJxnE5gRwGilsSg0o,1553
 praisonai/ui/public/game.svg,sha256=y2QMaA01m8XzuDjTOBWzupOC3-TpnUl9ah89mIhviUw,2406
 praisonai/ui/public/logo_dark.png,sha256=frHz1zkrnivGssJgk9iy1cabojkVgm8B4MllFwL_CnI,17050
@@ -33,8 +33,8 @@ praisonai/ui/public/movie.svg,sha256=aJ2EQ8vXZusVsF2SeuAVxP4RFJzQ14T26ejrGYdBgzk
 praisonai/ui/public/thriller.svg,sha256=2dYY72EcgbEyTxS4QzjAm37Y4srtPWEW4vCMFki98ZI,3163
 praisonai/ui/sql_alchemy.py,sha256=HsyeRq-G9qbQobHWpTJHHKQiT4FvYw_7iuv-2PNh0IU,27419
 praisonai/version.py,sha256=ugyuFliEqtAwQmH4sTlc16YXKYbFWDmfyk87fErB8-8,21
-praisonai-0.0.52.dist-info/LICENSE,sha256=kqvFysVlnFxYOu0HxCe2HlmZmJtdmNGOxWRRkT9TsWc,1035
-praisonai-0.0.52.dist-info/METADATA,sha256=p5keIFdjB4LMPWOy47FzYdxsXAfpd9mOGWvceM3syqc,11262
-praisonai-0.0.52.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-praisonai-0.0.52.dist-info/entry_points.txt,sha256=Qg41eW3A1-dvdV5tF7LqChfYof8Rihk2rN1fiEE3vnk,53
-praisonai-0.0.52.dist-info/RECORD,,
+praisonai-0.0.54.dist-info/LICENSE,sha256=kqvFysVlnFxYOu0HxCe2HlmZmJtdmNGOxWRRkT9TsWc,1035
+praisonai-0.0.54.dist-info/METADATA,sha256=gN0h13dvW6KvZD2wpuGZkoaO8TRcBpytB3_8t79Tg7U,12084
+praisonai-0.0.54.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+praisonai-0.0.54.dist-info/entry_points.txt,sha256=Qg41eW3A1-dvdV5tF7LqChfYof8Rihk2rN1fiEE3vnk,53
+praisonai-0.0.54.dist-info/RECORD,,