Merge pull request #123 from MervinPraison/develop

adding .praisoninclude and .praisoncontext

Author: MervinPraison

.praisoncontext

@@ -0,0 +1,2 @@
+# praisonai/ui/context.py
+# /Users/praison/miniconda3/envs/praisonai-package/lib/python3.11/site-packages/llama_index/packs/code_hierarchy/code_hierarchy.py

.praisoninclude

@@ -1 +1,2 @@
-#praisonai
+# praisonai/ui/context.py
+# /Users/praison/miniconda3/envs/praisonai-package/lib/python3.11/site-packages/llama_index/packs/code_hierarchy/code_hierarchy.py

Dockerfile

@@ -1,6 +1,6 @@
 FROM python:3.11-slim
 WORKDIR /app
 COPY . .
-RUN pip install flask praisonai==0.0.57 gunicorn markdown
+RUN pip install flask praisonai==0.0.58 gunicorn markdown
 EXPOSE 8080
 CMD ["gunicorn", "-b", "0.0.0.0:8080", "api:app"]

docs/api/praisonai/deploy.html

@@ -110,7 +110,7 @@ <h2 id="raises">Raises</h2>
             file.write(&#34;FROM python:3.11-slim\n&#34;)
             file.write(&#34;WORKDIR /app\n&#34;)
             file.write(&#34;COPY . .\n&#34;)
-            file.write(&#34;RUN pip install flask praisonai==0.0.57 gunicorn markdown\n&#34;)
+            file.write(&#34;RUN pip install flask praisonai==0.0.58 gunicorn markdown\n&#34;)
             file.write(&#34;EXPOSE 8080\n&#34;)
             file.write(&#39;CMD [&#34;gunicorn&#34;, &#34;-b&#34;, &#34;0.0.0.0:8080&#34;, &#34;api:app&#34;]\n&#39;)
 

docs/api/praisonai/ui/context.html

@@ -132,17 +132,36 @@ <h2 class="section-title" id="header-classes">Classes</h2>
         return modified_ignore_patterns
 
     def get_include_paths(self):
+        &#34;&#34;&#34;
+        Loads include paths from:
+            1. .praisoninclude (includes ONLY files/directories listed)
+            2. .praisoncontext (if .praisoninclude doesn&#39;t exist, this is used
+               to include all other relevant files, excluding ignore patterns)
+        &#34;&#34;&#34;
         include_paths = []
-
-        # 1. Load from .praisoninclude
-        include_file = os.path.join(self.directory, &#39;.praisoninclude&#39;)
+        include_all = False  # Flag to indicate if we need to include all files
+ 
+        include_file = os.path.join(self.directory, &#39;.praisoncontext&#39;)
         if os.path.exists(include_file):
             with open(include_file, &#39;r&#39;) as f:
                 include_paths.extend(
                     line.strip() for line in f
                     if line.strip() and not line.startswith(&#39;#&#39;)
                 )
-        return include_paths
+ 
+        # If .praisoncontext doesn&#39;t exist, fall back to .praisoninclude
+        # for including all relevant files
+        if not include_paths: 
+            include_file = os.path.join(self.directory, &#39;.praisoninclude&#39;)
+            if os.path.exists(include_file):
+                with open(include_file, &#39;r&#39;) as f:
+                    include_paths.extend(
+                        line.strip() for line in f
+                        if line.strip() and not line.startswith(&#39;#&#39;)
+                    )
+                include_all = True  # Include all files along with specified paths
+ 
+        return include_paths, include_all
 
     def should_ignore(self, file_path):
         &#34;&#34;&#34;
@@ -165,61 +184,78 @@ <h2 class="section-title" id="header-classes">Classes</h2>
                any(file_path.endswith(ext) for ext in self.relevant_extensions)
 
     def gather_context(self):
-        &#34;&#34;&#34;Gather context from relevant files, respecting ignore patterns and include paths.&#34;&#34;&#34;
+        &#34;&#34;&#34;
+        Gather context from relevant files, respecting ignore patterns
+        and include options from .praisoninclude and .praisoncontext.
+        &#34;&#34;&#34;
         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, &#39;r&#39;, encoding=&#39;utf-8&#39;) as f:
-                                content = f.read()
-                                context.append(f&#34;File: {file_path}\n\n{content}\n\n{&#39;=&#39;*50}\n&#34;)
-                                self.included_files.append(Path(file_path).relative_to(self.directory))
-                        except Exception as e:
-                            logger.error(f&#34;Error reading {file_path}: {e}&#34;)
-                    processed_files += 1
-                    print(f&#34;\rProcessed {processed_files}/{total_files} files&#34;, end=&#34;&#34;, flush=True)
-        else:
-            # Process specified include paths
+        def add_file_content(file_path):
+            &#34;&#34;&#34;Helper function to add file content to context.&#34;&#34;&#34;
+            try:
+                with open(file_path, &#39;r&#39;, encoding=&#39;utf-8&#39;) as f:
+                    content = f.read()
+                    context.append(
+                        f&#34;File: {file_path}\n\n{content}\n\n{&#39;=&#39; * 50}\n&#34;
+                    )
+                    self.included_files.append(
+                        Path(file_path).relative_to(self.directory)
+                    )
+            except Exception as e:
+                logger.error(f&#34;Error reading {file_path}: {e}&#34;)
+
+        def process_path(path):
+            &#34;&#34;&#34;Helper function to process a single path (file or directory).&#34;&#34;&#34;
+            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&#34;\rProcessed {processed_files}/{total_files} files&#34;,
+                            end=&#34;&#34;,
+                            flush=True,
+                        )
+            elif os.path.isfile(path) and self.is_relevant_file(path):
+                add_file_content(path)
+                processed_files += 1
+                print(
+                    f&#34;\rProcessed {processed_files}/1 files&#34;,
+                    end=&#34;&#34;,
+                    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)
-                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, &#39;r&#39;, encoding=&#39;utf-8&#39;) as f:
-                                        content = f.read()
-                                        context.append(f&#34;File: {file_path}\n\n{content}\n\n{&#39;=&#39;*50}\n&#34;)
-                                        self.included_files.append(Path(file_path).relative_to(self.directory))
-                                except Exception as e:
-                                    logger.error(f&#34;Error reading {file_path}: {e}&#34;)
-                            processed_files += 1
-                            print(f&#34;\rProcessed {processed_files}/{total_files} files&#34;, end=&#34;&#34;, flush=True)
-                elif os.path.isfile(full_path) and self.is_relevant_file(full_path):
-                    try:
-                        with open(full_path, &#39;r&#39;, encoding=&#39;utf-8&#39;) as f:
-                            content = f.read()
-                            context.append(f&#34;File: {full_path}\n\n{content}\n\n{&#39;=&#39;*50}\n&#34;)
-                            self.included_files.append(Path(full_path).relative_to(self.directory))
-                    except Exception as e:
-                        logger.error(f&#34;Error reading {full_path}: {e}&#34;)
-                    processed_files += 1
-                    print(f&#34;\rProcessed {processed_files}/{total_files} files&#34;, end=&#34;&#34;, flush=True)
+                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)
+                process_path(full_path)
+        else:
+            # No include options, process the entire directory
+            process_path(self.directory)
 
         print()  # New line after progress indicator
-        return &#39;\n&#39;.join(context)
+        return &#34;\n&#34;.join(context)
 
     def count_tokens(self, text):
         &#34;&#34;&#34;Count tokens using a simple whitespace-based tokenizer.&#34;&#34;&#34;
@@ -282,7 +318,8 @@ <h3>Methods</h3>
 <span>def <span class="ident">gather_context</span></span>(<span>self)</span>
 </code></dt>
 <dd>
-<div class="desc"><p>Gather context from relevant files, respecting ignore patterns and include paths.</p></div>
+<div class="desc"><p>Gather context from relevant files, respecting ignore patterns
+and include options from .praisoninclude and .praisoncontext.</p></div>
 </dd>
 <dt id="praisonai.ui.context.ContextGatherer.get_context_tree"><code class="name flex">
 <span>def <span class="ident">get_context_tree</span></span>(<span>self)</span>
@@ -306,7 +343,10 @@ <h3>Methods</h3>
 <span>def <span class="ident">get_include_paths</span></span>(<span>self)</span>
 </code></dt>
 <dd>
-<div class="desc"></div>
+<div class="desc"><p>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)</p></div>
 </dd>
 <dt id="praisonai.ui.context.ContextGatherer.is_relevant_file"><code class="name flex">
 <span>def <span class="ident">is_relevant_file</span></span>(<span>self, file_path)</span>

docs/ui/code.md

@@ -20,7 +20,7 @@ PraisonAI Code helps you to interact with your whole codebase using the power of
   - [Using settings.yaml](#using-settingsyaml)
   - [Using .env File](#using-env-file)
   - [Using Environment Variables in the Terminal](#using-environment-variables-in-the-terminal)
-- [Include Files](#include-files)
+- [Include Files](#include-files-praisoninclude)
 - [Set Max Tokens](#set-max-tokens)
 
 ## Install PraisonAI Code
@@ -114,11 +114,10 @@ PRAISONAI_IGNORE_FILES=".*,*.pyc,__pycache__,.git,.gitignore,.vscode"
 export PRAISONAI_IGNORE_FILES=".*,*.pyc,__pycache__,.git,.gitignore,.vscode"
 ```
 
-## Include Files
+## Include Files .praisoninclude
 
 - Add files you wish to Include files in the context
-- This will automatically ignore all the ignore files option
-- This will include only the files/folders mentioned in `.praisoninclude` to the context
+- This will include the files/folders mentioned in `.praisoninclude` to the original context (files in the folder - .gitignore  - .praisonignore)
 
 * Create a `.praisoninclude` file in the root folder of the project
 * Add files to Include
@@ -128,6 +127,19 @@ projectfiles
 docs
 ```
 
+## Include ONLY these Files .praisoncontext (Context)
+
+- Add files you wish to Include files in the context
+- This will include ONLY the files/folders mentioned in `.praisoncontext` to the context
+
+* Create a `.praisoncontext` file in the root folder of the project
+* Add files to Include
+
+```bash
+projectfiles
+docs
+```
+
 ## Set Max Tokens
 
 Note: By Default Max Tokens set is 900,000
@@ -142,4 +154,8 @@ or
 * Add below Variables and required Max Tokens
 * ```
   PRAISONAI_MAX_TOKENS=1000000
-  ```
+  ```
+
+## Default DB Location
+
+`~/.praison/database.sqlite`

praisonai.rb

@@ -0,0 +1,20 @@
+class Praisonai < Formula
+    include Language::Python::Virtualenv
+  
+    desc "AI tools for various AI applications"
+    homepage "https://github.com/MervinPraison/PraisonAI"
+    url "https://github.com/MervinPraison/PraisonAI/archive/refs/tags/0.0.58.tar.gz"
+    sha256 "1828fb9227d10f991522c3f24f061943a254b667196b40b1a3e4a54a8d30ce32"  # Replace with actual SHA256 checksum
+    license "MIT"
+  
+    depends_on "[email protected]"
+  
+    def install
+      virtualenv_install_with_resources
+    end
+  
+    test do
+      system "#{bin}/praisonai", "--version"
+    end
+  end
+  

praisonai/deploy.py

@@ -56,7 +56,7 @@ def create_dockerfile(self):
             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')