PraisonAI 0.0.57__py3-none-any.whl → 0.0.58__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.57 gunicorn markdown\n")
+            file.write("RUN pip install flask praisonai==0.0.58 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

@@ -97,17 +97,36 @@ class ContextGatherer:
         return modified_ignore_patterns
 
     def get_include_paths(self):
+        """
+        Loads include paths from:
+            1. .praisoninclude (includes ONLY files/directories listed)
+            2. .praisoncontext (if .praisoninclude doesn't exist, this is used
+               to include all other relevant files, excluding ignore patterns)
+        """
         include_paths = []
-
-        # 1. Load from .praisoninclude
-        include_file = os.path.join(self.directory, '.praisoninclude')
+        include_all = False  # Flag to indicate if we need to include all files
+ 
+        include_file = os.path.join(self.directory, '.praisoncontext')
         if os.path.exists(include_file):
             with open(include_file, 'r') as f:
                 include_paths.extend(
                     line.strip() for line in f
                     if line.strip() and not line.startswith('#')
                 )
-        return include_paths
+ 
+        # If .praisoncontext doesn't exist, fall back to .praisoninclude
+        # for including all relevant files
+        if not include_paths: 
+            include_file = os.path.join(self.directory, '.praisoninclude')
+            if os.path.exists(include_file):
+                with open(include_file, 'r') as f:
+                    include_paths.extend(
+                        line.strip() for line in f
+                        if line.strip() and not line.startswith('#')
+                    )
+                include_all = True  # Include all files along with specified paths
+ 
+        return include_paths, include_all
 
     def should_ignore(self, file_path):
         """
@@ -130,61 +149,78 @@ class ContextGatherer:
                any(file_path.endswith(ext) for ext in self.relevant_extensions)
 
     def gather_context(self):
-        """Gather context from relevant files, respecting ignore patterns and include paths."""
+        """
+        Gather context from relevant files, respecting ignore patterns
+        and include options from .praisoninclude and .praisoncontext.
+        """
         context = []
         total_files = 0
         processed_files = 0
+        self.include_paths, include_all = self.get_include_paths()
 
-        if not self.include_paths:
-            # No include paths specified, process the entire directory
-            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)
-                    if not self.should_ignore(file_path) and self.is_relevant_file(file_path):
-                        try:
-                            with open(file_path, 'r', encoding='utf-8') as f:
-                                content = f.read()
-                                context.append(f"File: {file_path}\n\n{content}\n\n{'='*50}\n")
-                                self.included_files.append(Path(file_path).relative_to(self.directory))
-                        except Exception as e:
-                            logger.error(f"Error reading {file_path}: {e}")
-                    processed_files += 1
-                    print(f"\rProcessed {processed_files}/{total_files} files", end="", flush=True)
-        else:
-            # Process specified include paths
+        def add_file_content(file_path):
+            """Helper function to add file content to context."""
+            try:
+                with open(file_path, 'r', encoding='utf-8') as f:
+                    content = f.read()
+                    context.append(
+                        f"File: {file_path}\n\n{content}\n\n{'=' * 50}\n"
+                    )
+                    self.included_files.append(
+                        Path(file_path).relative_to(self.directory)
+                    )
+            except Exception as e:
+                logger.error(f"Error reading {file_path}: {e}")
+
+        def process_path(path):
+            """Helper function to process a single path (file or directory)."""
+            nonlocal total_files, processed_files
+            if os.path.isdir(path):
+                for root, dirs, files in os.walk(path):
+                    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)
+                        if not self.should_ignore(file_path) and self.is_relevant_file(file_path):
+                            add_file_content(file_path)
+                        processed_files += 1
+                        print(
+                            f"\rProcessed {processed_files}/{total_files} files",
+                            end="",
+                            flush=True,
+                        )
+            elif os.path.isfile(path) and self.is_relevant_file(path):
+                add_file_content(path)
+                processed_files += 1
+                print(
+                    f"\rProcessed {processed_files}/1 files",
+                    end="",
+                    flush=True,
+                )
+
+        if include_all:
+            # Include ALL relevant files from the entire directory
+            process_path(self.directory)
+            
+            # Include files from .praisoninclude specifically
+            for include_path in self.include_paths:
+                full_path = os.path.join(self.directory, include_path)
+                process_path(full_path)
+        elif self.include_paths:
+            # Include only files specified in .praisoncontext
             for include_path in self.include_paths:
                 full_path = os.path.join(self.directory, include_path)
-                if os.path.isdir(full_path):
-                    for root, dirs, files in os.walk(full_path):
-                        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)
-                            if not self.should_ignore(file_path) and self.is_relevant_file(file_path):
-                                try:
-                                    with open(file_path, 'r', encoding='utf-8') as f:
-                                        content = f.read()
-                                        context.append(f"File: {file_path}\n\n{content}\n\n{'='*50}\n")
-                                        self.included_files.append(Path(file_path).relative_to(self.directory))
-                                except Exception as e:
-                                    logger.error(f"Error reading {file_path}: {e}")
-                            processed_files += 1
-                            print(f"\rProcessed {processed_files}/{total_files} files", end="", flush=True)
-                elif os.path.isfile(full_path) and self.is_relevant_file(full_path):
-                    try:
-                        with open(full_path, 'r', encoding='utf-8') as f:
-                            content = f.read()
-                            context.append(f"File: {full_path}\n\n{content}\n\n{'='*50}\n")
-                            self.included_files.append(Path(full_path).relative_to(self.directory))
-                    except Exception as e:
-                        logger.error(f"Error reading {full_path}: {e}")
-                    processed_files += 1
-                    print(f"\rProcessed {processed_files}/{total_files} files", end="", flush=True)
+                process_path(full_path)
+        else:
+            # No include options, process the entire directory
+            process_path(self.directory)
 
         print()  # New line after progress indicator
-        return '\n'.join(context)
+        return "\n".join(context)
 
     def count_tokens(self, text):
         """Count tokens using a simple whitespace-based tokenizer."""

{praisonai-0.0.57.dist-info → praisonai-0.0.58.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PraisonAI
-Version: 0.0.57
+Version: 0.0.58
 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

{praisonai-0.0.57.dist-info → praisonai-0.0.58.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=qypJw8aLvCp82T9UD5DV4v8wgaHjMqeCaruAKzjYCag,6028
+praisonai/deploy.py,sha256=cC-uc11Q3CFOxmk9F5vsFIviKEFe8o3IBCz78k7Xl_w,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=OL-wesjA5JTohr8rtr6kWoaS4ImkJg2l0GXJ-dUUfRU,4090
 praisonai/ui/chat.py,sha256=B4F1R7qP-0c-elg8WcRsYlr6-FkmHWtdunGIzU7WrDM,9321
 praisonai/ui/code.py,sha256=GcOr8lNah4AgI2RcIKmgjehzSl-KNu7x6UHrghixeaM,10095
-praisonai/ui/context.py,sha256=xLVyRa8UDy1HJyMa7RSFz0Lkq4qQ-E4pPLfgzP51_k8,11281
+praisonai/ui/context.py,sha256=oWO2I_WBZb7kZnuXItf18EJX0ZQv-1nAd8rxhwhuuDU,11871
 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.57.dist-info/LICENSE,sha256=kqvFysVlnFxYOu0HxCe2HlmZmJtdmNGOxWRRkT9TsWc,1035
-praisonai-0.0.57.dist-info/METADATA,sha256=GpM64zyjRG9J-mF9JMJeCLPQz2STlzAE92cT9Q-9HUU,11126
-praisonai-0.0.57.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-praisonai-0.0.57.dist-info/entry_points.txt,sha256=Qg41eW3A1-dvdV5tF7LqChfYof8Rihk2rN1fiEE3vnk,53
-praisonai-0.0.57.dist-info/RECORD,,
+praisonai-0.0.58.dist-info/LICENSE,sha256=kqvFysVlnFxYOu0HxCe2HlmZmJtdmNGOxWRRkT9TsWc,1035
+praisonai-0.0.58.dist-info/METADATA,sha256=J2s1lws01jHcyUE3tcex4SkDKfys2BoyJT84GTM0iTc,11126
+praisonai-0.0.58.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+praisonai-0.0.58.dist-info/entry_points.txt,sha256=Qg41eW3A1-dvdV5tF7LqChfYof8Rihk2rN1fiEE3vnk,53
+praisonai-0.0.58.dist-info/RECORD,,