updated readme

fixed youtube

README.md

@@ -47,6 +47,11 @@
 
 <br />
 
+> [!NOTE]  
+> We are adding functionality to the project so often that you should update often as well. That means: `git pull; ./setup.sh; fabric --update` in the main directory, and then sourcing your shell files and/or restarting your terminal. So exciting!
+
+**March 11, 2024** — We just added support for Claude, local models via Ollama, and a number of new Patterns. Be sure to update and check `fabric -h` for the latest!
+
 ## Introduction video
 
 <div align="center">
@@ -143,40 +148,35 @@ git clone https://github.com/danielmiessler/fabric.git
 cd fabric
 ```
 
-4. Ensure the `setup.sh` script is executable. If you're not sure, you can make it executable by running the following command:
+4. install pipx:
+
+Mac:
 
 ```bash
-chmod +x setup.sh
+brew install pipx
 ```
 
-5. Install poetry
-
-ref.: https://python-poetry.org/docs/#installing-with-the-official-installer
+Linux:
 
 ```bash
-curl -sSL https://install.python-poetry.org | python3 -
+sudo apt intall pipx
 ```
 
-6. Run the `setup.sh`, which will do the following:
-
-- Installs python dependencies.
-- Creates aliases in your OS. It should update `~/.bashrc`, `/.zshrc`, and `~/.bash_profile` if they are present in your file system.
+5. Install fabric
 
 ```bash
-./setup.sh
+pipx install .
 ```
 
-7. Restart your shell to reload everything.
-
-8. Set your `OPENAI_API_KEY`.
+6. Run setup:
 
 ```bash
 fabric --setup
 ```
 
-You'll be asked to enter your OpenAI API key, which will be written to `~/.config/fabric/.env`. Patterns will then be downloaded from Github, which will take a few moments.
+7. Restart your shell to reload everything.
 
-9. Now you are up and running! You can test by pulling the help.
+8. Now you are up and running! You can test by pulling the help.
 
 ```bash
 # Making sure the paths are set up correctly
@@ -194,25 +194,45 @@ Once you have it all set up, here's how to use it.
    `fabric -h`
 
 ```bash
-fabric [-h] [--text TEXT] [--copy] [--output [OUTPUT]] [--stream] [--list]
-              [--update] [--pattern PATTERN] [--setup]
+fabric [-h] [--text TEXT] [--copy] [--agents {trip_planner,ApiKeys}]
+              [--output [OUTPUT]] [--stream] [--list] [--clear] [--update]
+              [--pattern PATTERN] [--setup]
+              [--changeDefaultModel CHANGEDEFAULTMODEL] [--model MODEL]
+              [--listmodels] [--context]
 
-An open-source framework for augmenting humans using AI.
+An open source framework for augmenting humans using AI.
 
 options:
   -h, --help            show this help message and exit
   --text TEXT, -t TEXT  Text to extract summary from
-  --copy, -c            Copy the response to the clipboard
+  --copy, -C            Copy the response to the clipboard
+  --agents {trip_planner,ApiKeys}, -a {trip_planner,ApiKeys}
+                        Use an AI agent to help you with a task. Acceptable
+                        values are 'trip_planner' or 'ApiKeys'. This option
+                        cannot be used with any other flag.
   --output [OUTPUT], -o [OUTPUT]
                         Save the response to a file
-  --stream, -s          Use this option if you want to see the results in realtime.
-                        NOTE: You will not be able to pipe the output into another
-                        command.
+  --stream, -s          Use this option if you want to see the results in
+                        realtime. NOTE: You will not be able to pipe the
+                        output into another command.
   --list, -l            List available patterns
+  --clear               Clears your persistent model choice so that you can
+                        once again use the --model flag
   --update, -u          Update patterns
   --pattern PATTERN, -p PATTERN
                         The pattern (prompt) to use
   --setup               Set up your fabric instance
+  --changeDefaultModel CHANGEDEFAULTMODEL
+                        Change the default model. Your choice will be saved in
+                        ~/.config/fabric/.env). For a list of available
+                        models, use the --listmodels flag.
+  --model MODEL, -m MODEL
+                        Select the model to use. NOTE: Will not work if you
+                        have set a default model. please use --clear to clear
+                        persistence before using this flag
+  --listmodels          List all available models
+  --context, -c         Use Context file (context.md) to add context to your
+                        pattern
 ```
 
 #### Example commands
@@ -287,7 +307,7 @@ Once you're set up, you can do things like:
 
 ```bash
 # Take any idea from `stdin` and send it to the `/write_essay` API!
-cat "An idea that coding is like speaking with rules." | write_essay
+echo "An idea that coding is like speaking with rules." | write_essay
 ```
 
 ### Directly calling Patterns

helpers/.python-version

@@ -0,0 +1 @@
+3.10

helpers/README.md

@@ -6,6 +6,24 @@ These are helper tools to work with Fabric. Examples include things like getting
 
 `yt` is a command that uses the YouTube API to pull transcripts, get video duration, and other functions. It's primary function is to get a transcript from a video that can then be stitched (piped) into other Fabric Patterns.
 
+## ts (Audio transcriptions)
+
+'ts' is a command that uses the OpenApi Whisper API to transcribe audio files. Due to the context window, this tool uses pydub to split the files into 10 minute segments. for more information on pydub, please refer https://github.com/jiaaro/pydub
+
+### installation
+
+```bash
+
+mac:
+brew install ffmpeg
+
+linux:
+apt install ffmpeg
+
+windows:
+download instructions https://www.ffmpeg.org/download.html
+```
+
 ```bash
 usage: yt [-h] [--duration] [--transcript] [url]
 
@@ -19,3 +37,16 @@ options:
   --duration    Output only the duration
   --transcript  Output only the transcript
 ```
+
+```bash
+ts -h
+usage: ts [-h] audio_file
+
+Transcribe an audio file.
+
+positional arguments:
+  audio_file  The path to the audio file to be transcribed.
+
+options:
+  -h, --help  show this help message and exit
+```

helpers/ts.py

@@ -0,0 +1,110 @@
+from dotenv import load_dotenv
+from pydub import AudioSegment
+from openai import OpenAI
+import os
+import argparse
+
+
+class Whisper:
+    def __init__(self):
+        env_file = os.path.expanduser("~/.config/fabric/.env")
+        load_dotenv(env_file)
+        try:
+            apikey = os.environ["OPENAI_API_KEY"]
+            self.client = OpenAI()
+            self.client.api_key = apikey
+        except KeyError:
+            print("OPENAI_API_KEY not found in environment variables.")
+
+        except FileNotFoundError:
+            print("No API key found. Use the --apikey option to set the key")
+        self.whole_response = []
+
+    def split_audio(self, file_path):
+        """
+        Splits the audio file into segments of the given length.
+
+        Args:
+        - file_path: The path to the audio file.
+        - segment_length_ms: Length of each segment in milliseconds.
+
+        Returns:
+        - A list of audio segments.
+        """
+        audio = AudioSegment.from_file(file_path)
+        segments = []
+        segment_length_ms = 10 * 60 * 1000  # 10 minutes in milliseconds
+        for start_ms in range(0, len(audio), segment_length_ms):
+            end_ms = start_ms + segment_length_ms
+            segment = audio[start_ms:end_ms]
+            segments.append(segment)
+
+        return segments
+
+    def process_segment(self, segment):
+        """        Transcribe an audio file and print the transcript.
+
+        Args:
+            audio_file (str): The path to the audio file to be transcribed.
+
+        Returns:
+            None
+        """
+
+        try:
+            # if audio_file.startswith("http"):
+            #     response = requests.get(audio_file)
+            #     response.raise_for_status()
+            #     with tempfile.NamedTemporaryFile(delete=False) as f:
+            #         f.write(response.content)
+            #         audio_file = f.name
+            audio_file = open(segment, "rb")
+            response = self.client.audio.transcriptions.create(
+                model="whisper-1",
+                file=audio_file
+            )
+            self.whole_response.append(response.text)
+
+        except Exception as e:
+            print(f"Error: {e}")
+
+    def process_file(self, audio_file):
+        """        Transcribe an audio file and print the transcript.
+
+        Args:
+            audio_file (str): The path to the audio file to be transcribed.
+
+        Returns:
+            None
+        """
+
+        try:
+            # if audio_file.startswith("http"):
+            #     response = requests.get(audio_file)
+            #     response.raise_for_status()
+            #     with tempfile.NamedTemporaryFile(delete=False) as f:
+            #         f.write(response.content)
+            #         audio_file = f.name
+
+            segments = self.split_audio(audio_file)
+            for i, segment in enumerate(segments):
+                segment_file_path = f"segment_{i}.mp3"
+                segment.export(segment_file_path, format="mp3")
+                self.process_segment(segment_file_path)
+            print(' '.join(self.whole_response))
+
+        except Exception as e:
+            print(f"Error: {e}")
+
+
+def main():
+    parser = argparse.ArgumentParser(description="Transcribe an audio file.")
+    parser.add_argument(
+        "audio_file", help="The path to the audio file to be transcribed.")
+    args = parser.parse_args()
+    whisper = Whisper()
+    whisper.process_file(args.audio_file)
+
+
+if __name__ == "__main__":
+    main()

helpers/yt.py

@@ -1,6 +1,3 @@
-#!/usr/bin/env python3
-
-import sys
 import re
 from googleapiclient.discovery import build
 from googleapiclient.errors import HttpError
@@ -11,13 +8,15 @@ import json
 import isodate
 import argparse
 
+
 def get_video_id(url):
     # Extract video ID from URL
     pattern = r'(?:https?:\/\/)?(?:www\.)?(?:youtube\.com\/(?:[^\/\n\s]+\/\S+\/|(?:v|e(?:mbed)?)\/|\S*?[?&]v=)|youtu\.be\/)([a-zA-Z0-9_-]{11})'
     match = re.search(pattern, url)
     return match.group(1) if match else None
 
-def main(url, options):
+
+def main_function(url, options):
     # Load environment variables from .env file
     load_dotenv(os.path.expanduser('~/.config/fabric/.env'))
 
@@ -51,7 +50,8 @@ def main(url, options):
         # Get video transcript
         try:
             transcript_list = YouTubeTranscriptApi.get_transcript(video_id)
-            transcript_text = ' '.join([item['text'] for item in transcript_list])
+            transcript_text = ' '.join([item['text']
+                                       for item in transcript_list])
             transcript_text = transcript_text.replace('\n', ' ')
         except Exception as e:
             transcript_text = "Transcript not available."
@@ -72,14 +72,22 @@ def main(url, options):
     except HttpError as e:
         print("Error: Failed to access YouTube API. Please check your YOUTUBE_API_KEY and ensure it is valid.")
 
-if __name__ == '__main__':
-    parser = argparse.ArgumentParser(description='vm (video meta) extracts metadata about a video, such as the transcript and the video\'s duration. By Daniel Miessler.')
+
+def main():
+    parser = argparse.ArgumentParser(
+        description='vm (video meta) extracts metadata about a video, such as the transcript and the video\'s duration. By Daniel Miessler.')
     parser.add_argument('url', nargs='?', help='YouTube video URL')
-    parser.add_argument('--duration', action='store_true', help='Output only the duration')
-    parser.add_argument('--transcript', action='store_true', help='Output only the transcript')
+    parser.add_argument('--duration', action='store_true',
+                        help='Output only the duration')
+    parser.add_argument('--transcript', action='store_true',
+                        help='Output only the transcript')
     args = parser.parse_args()
 
     if args.url:
-        main(args.url, args)
+        main_function(args.url, args)
     else:
         parser.print_help()
+
+
+if __name__ == "__main__":
+    main()

installer/client/cli/README.md

@@ -1,69 +1,3 @@
 # The `fabric` client
 
-This is the primary `fabric` client, which has multiple modes of operation.
-
-## Client modes
-
-You can use the client in three different modes:
-
-1. **Local Only:** You can use the client without a server, and it will use patterns it's downloaded from this repository, or ones that you specify.
-2. **Local Server:** You can run your own version of a Fabric Mill locally (on a private IP), which you can then connect to and use.
-3. **Remote Server:** You can specify a remote server that your client commands will then be calling.
-
-## Client features
-
-1. Standalone Mode: Run without needing a server.
-2. Clipboard Integration: Copy responses to the clipboard.
-3. File Output: Save responses to files for later reference.
-4. Pattern Module: Utilize specific patterns for different types of analysis.
-5. Server Mode: Operate the tool in server mode to control your own patterns and let your other apps access it.
-
-## Installation
-
-Please check our main [setting up the fabric commands](./../../../README.md#setting-up-the-fabric-commands) section.
-
-## Usage
-
-To use `fabric`, call it with your desired options (remember to activate the virtual environment with `poetry shell` - step 5 above):
-
-fabric [options]
-Options include:
-
---pattern, -p: Select the module for analysis.
---stream, -s: Stream output to another application.
---output, -o: Save the response to a file.
---copy, -C: Copy the response to the clipboard.
---context, -c: Use Context file (context.md) to add context to your pattern
-
-Example:
-
-```bash
-# Pasting in an article about LLMs
-pbpaste | fabric --pattern extract_wisdom --output wisdom.txt | fabric --pattern summarize --stream
-```
-
-```markdown
-ONE SENTENCE SUMMARY:
-
-- The content covered the basics of LLMs and how they are used in everyday practice.
-
-MAIN POINTS:
-
-1. LLMs are large language models, and typically use the transformer architecture.
-2. LLMs used to be used for story generation, but they're now used for many AI applications.
-3. They are vulnerable to hallucination if not configured correctly, so be careful.
-
-TAKEAWAYS:
-
-1. It's possible to use LLMs for multiple AI use cases.
-2. It's important to validate that the results you're receiving are correct.
-3. The field of AI is moving faster than ever as a result of GenAI breakthroughs.
-```
-
-## Contributing
-
-We welcome contributions to Fabric, including improvements and feature additions to this client.
-
-## Credits
-
-The `fabric` client was created by Jonathan Dunn and Daniel Meissler.
+Please see the main project's README.md for the latest documentation.

installer/client/cli/agents/trip_planner/main.py

@@ -0,0 +1,89 @@
+from crewai import Crew
+from textwrap import dedent
+from .trip_agents import TripAgents
+from .trip_tasks import TripTasks
+import os
+from dotenv import load_dotenv
+
+current_directory = os.path.dirname(os.path.realpath(__file__))
+config_directory = os.path.expanduser("~/.config/fabric")
+env_file = os.path.join(config_directory, ".env")
+load_dotenv(env_file)
+os.environ['OPENAI_MODEL_NAME'] = 'gpt-4-0125-preview'
+
+
+class TripCrew:
+
+    def __init__(self, origin, cities, date_range, interests):
+        self.cities = cities
+        self.origin = origin
+        self.interests = interests
+        self.date_range = date_range
+
+    def run(self):
+        agents = TripAgents()
+        tasks = TripTasks()
+
+        city_selector_agent = agents.city_selection_agent()
+        local_expert_agent = agents.local_expert()
+        travel_concierge_agent = agents.travel_concierge()
+
+        identify_task = tasks.identify_task(
+            city_selector_agent,
+            self.origin,
+            self.cities,
+            self.interests,
+            self.date_range
+        )
+        gather_task = tasks.gather_task(
+            local_expert_agent,
+            self.origin,
+            self.interests,
+            self.date_range
+        )
+        plan_task = tasks.plan_task(
+            travel_concierge_agent,
+            self.origin,
+            self.interests,
+            self.date_range
+        )
+
+        crew = Crew(
+            agents=[
+                city_selector_agent, local_expert_agent, travel_concierge_agent
+            ],
+            tasks=[identify_task, gather_task, plan_task],
+            verbose=True
+        )
+
+        result = crew.kickoff()
+        return result
+
+
+class planner_cli:
+    def ask(self):
+        print("## Welcome to Trip Planner Crew")
+        print('-------------------------------')
+        location = input(
+            dedent("""
+        From where will you be traveling from?
+        """))
+        cities = input(
+            dedent("""
+        What are the cities options you are interested in visiting?
+        """))
+        date_range = input(
+            dedent("""
+        What is the date range you are interested in traveling?
+        """))
+        interests = input(
+            dedent("""
+        What are some of your high level interests and hobbies?
+        """))
+
+        trip_crew = TripCrew(location, cities, date_range, interests)
+        result = trip_crew.run()
+        print("\n\n########################")
+        print("## Here is you Trip Plan")
+        print("########################\n")
+        print(result)

installer/client/cli/agents/trip_planner/tools/browser_tools.py

@@ -0,0 +1,38 @@
+import json
+import os
+
+import requests
+from crewai import Agent, Task
+from langchain.tools import tool
+from unstructured.partition.html import partition_html
+
+
+class BrowserTools():
+
+  @tool("Scrape website content")
+  def scrape_and_summarize_website(website):
+    """Useful to scrape and summarize a website content"""
+    url = f"https://chrome.browserless.io/content?token={os.environ['BROWSERLESS_API_KEY']}"
+    payload = json.dumps({"url": website})
+    headers = {'cache-control': 'no-cache', 'content-type': 'application/json'}
+    response = requests.request("POST", url, headers=headers, data=payload)
+    elements = partition_html(text=response.text)
+    content = "\n\n".join([str(el) for el in elements])
+    content = [content[i:i + 8000] for i in range(0, len(content), 8000)]
+    summaries = []
+    for chunk in content:
+      agent = Agent(
+          role='Principal Researcher',
+          goal=
+          'Do amazing researches and summaries based on the content you are working with',
+          backstory=
+          "You're a Principal Researcher at a big company and you need to do a research about a given topic.",
+          allow_delegation=False)
+      task = Task(
+          agent=agent,
+          description=
+          f'Analyze and summarize the content bellow, make sure to include the most relevant information in the summary, return only the summary nothing else.\n\nCONTENT\n----------\n{chunk}'
+      )
+      summary = task.execute()
+      summaries.append(summary)
+    return "\n\n".join(summaries)

installer/client/cli/agents/trip_planner/tools/calculator_tools.py

@@ -0,0 +1,15 @@
+from langchain.tools import tool
+
+class CalculatorTools():
+
+    @tool("Make a calculation")
+    def calculate(operation):
+        """Useful to perform any mathematical calculations, 
+        like sum, minus, multiplication, division, etc.
+        The input to this tool should be a mathematical 
+        expression, a couple examples are `200*7` or `5000/2*10`
+        """
+        try:
+            return eval(operation)
+        except SyntaxError:
+            return "Error: Invalid syntax in mathematical expression"

installer/client/cli/agents/trip_planner/tools/search_tools.py

@@ -0,0 +1,37 @@
+import json
+import os
+
+import requests
+from langchain.tools import tool
+
+
+class SearchTools():
+
+  @tool("Search the internet")
+  def search_internet(query):
+    """Useful to search the internet
+    about a a given topic and return relevant results"""
+    top_result_to_return = 4
+    url = "https://google.serper.dev/search"
+    payload = json.dumps({"q": query})
+    headers = {
+        'X-API-KEY': os.environ['SERPER_API_KEY'],
+        'content-type': 'application/json'
+    }
+    response = requests.request("POST", url, headers=headers, data=payload)
+    # check if there is an organic key
+    if 'organic' not in response.json():
+      return "Sorry, I couldn't find anything about that, there could be an error with you serper api key."
+    else:
+      results = response.json()['organic']
+      string = []
+      for result in results[:top_result_to_return]:
+        try:
+          string.append('\n'.join([
+              f"Title: {result['title']}", f"Link: {result['link']}",
+              f"Snippet: {result['snippet']}", "\n-----------------"
+          ]))
+        except KeyError:
+          next
+
+      return '\n'.join(string)

installer/client/cli/agents/trip_planner/trip_agents.py

@@ -0,0 +1,45 @@
+from crewai import Agent
+
+from .tools.browser_tools import BrowserTools
+from .tools.calculator_tools import CalculatorTools
+from .tools.search_tools import SearchTools
+
+
+class TripAgents():
+
+    def city_selection_agent(self):
+        return Agent(
+            role='City Selection Expert',
+            goal='Select the best city based on weather, season, and prices',
+            backstory='An expert in analyzing travel data to pick ideal destinations',
+            tools=[
+                SearchTools.search_internet,
+                BrowserTools.scrape_and_summarize_website,
+            ],
+            verbose=True)
+
+    def local_expert(self):
+        return Agent(
+            role='Local Expert at this city',
+            goal='Provide the BEST insights about the selected city',
+            backstory="""A knowledgeable local guide with extensive information
+        about the city, it's attractions and customs""",
+            tools=[
+                SearchTools.search_internet,
+                BrowserTools.scrape_and_summarize_website,
+            ],
+            verbose=True)
+
+    def travel_concierge(self):
+        return Agent(
+            role='Amazing Travel Concierge',
+            goal="""Create the most amazing travel itineraries with budget and 
+        packing suggestions for the city""",
+            backstory="""Specialist in travel planning and logistics with 
+        decades of experience""",
+            tools=[
+                SearchTools.search_internet,
+                BrowserTools.scrape_and_summarize_website,
+                CalculatorTools.calculate,
+            ],
+            verbose=True)

installer/client/cli/agents/trip_planner/trip_tasks.py

@@ -0,0 +1,83 @@
+from crewai import Task
+from textwrap import dedent
+from datetime import date
+
+
+class TripTasks():
+
+  def identify_task(self, agent, origin, cities, interests, range):
+    return Task(description=dedent(f"""
+        Analyze and select the best city for the trip based 
+        on specific criteria such as weather patterns, seasonal
+        events, and travel costs. This task involves comparing
+        multiple cities, considering factors like current weather
+        conditions, upcoming cultural or seasonal events, and
+        overall travel expenses. 
+        
+        Your final answer must be a detailed
+        report on the chosen city, and everything you found out
+        about it, including the actual flight costs, weather 
+        forecast and attractions.
+        {self.__tip_section()}
+
+        Traveling from: {origin}
+        City Options: {cities}
+        Trip Date: {range}
+        Traveler Interests: {interests}
+      """),
+                agent=agent)
+
+  def gather_task(self, agent, origin, interests, range):
+    return Task(description=dedent(f"""
+        As a local expert on this city you must compile an 
+        in-depth guide for someone traveling there and wanting 
+        to have THE BEST trip ever!
+        Gather information about  key attractions, local customs,
+        special events, and daily activity recommendations.
+        Find the best spots to go to, the kind of place only a
+        local would know.
+        This guide should provide a thorough overview of what 
+        the city has to offer, including hidden gems, cultural
+        hotspots, must-visit landmarks, weather forecasts, and
+        high level costs.
+        
+        The final answer must be a comprehensive city guide, 
+        rich in cultural insights and practical tips, 
+        tailored to enhance the travel experience.
+        {self.__tip_section()}
+
+        Trip Date: {range}
+        Traveling from: {origin}
+        Traveler Interests: {interests}
+      """),
+                agent=agent)
+
+  def plan_task(self, agent, origin, interests, range):
+    return Task(description=dedent(f"""
+        Expand this guide into a a full 7-day travel 
+        itinerary with detailed per-day plans, including 
+        weather forecasts, places to eat, packing suggestions, 
+        and a budget breakdown.
+        
+        You MUST suggest actual places to visit, actual hotels 
+        to stay and actual restaurants to go to.
+        
+        This itinerary should cover all aspects of the trip, 
+        from arrival to departure, integrating the city guide
+        information with practical travel logistics.
+        
+        Your final answer MUST be a complete expanded travel plan,
+        formatted as markdown, encompassing a daily schedule,
+        anticipated weather conditions, recommended clothing and
+        items to pack, and a detailed budget, ensuring THE BEST
+        TRIP EVER, Be specific and give it a reason why you picked
+        # up each place, what make them special! {self.__tip_section()}
+
+        Trip Date: {range}
+        Traveling from: {origin}
+        Traveler Interests: {interests}
+      """),
+                agent=agent)
+
+  def __tip_section(self):
+    return "If you do your BEST WORK, I'll tip you $100!"

installer/client/cli/context.md

@@ -1,3 +0,0 @@
-# Context
-
-please give all responses in spanish

installer/client/cli/fabric.py

@@ -1,7 +1,6 @@
 from .utils import Standalone, Update, Setup, Alias
 import argparse
 import sys
-import time
 import os
 
 
@@ -16,6 +15,11 @@ def main():
     parser.add_argument(
         "--copy", "-C", help="Copy the response to the clipboard", action="store_true"
     )
+    parser.add_argument(
+        '--agents', '-a', choices=['trip_planner', 'ApiKeys'],
+        help="Use an AI agent to help you with a task. Acceptable values are 'trip_planner' or 'ApiKeys'. This option cannot be used with any other flag."
+    )
+
     parser.add_argument(
         "--output",
         "-o",
@@ -33,18 +37,25 @@ def main():
     parser.add_argument(
         "--list", "-l", help="List available patterns", action="store_true"
     )
+    parser.add_argument('--clear', help="Clears your persistent model choice so that you can once again use the --model flag",
+                        action="store_true")
     parser.add_argument(
-        "--update", "-u", help="Update patterns", action="store_true")
+        "--update", "-u", help="Update patterns. NOTE: This will revert the default model to gpt4-turbo. please run --changeDefaultModel to once again set default model", action="store_true")
     parser.add_argument("--pattern", "-p", help="The pattern (prompt) to use")
     parser.add_argument(
         "--setup", help="Set up your fabric instance", action="store_true"
     )
+    parser.add_argument('--changeDefaultModel',
+                        help="Change the default model. For a list of available models, use the --listmodels flag.")
+
     parser.add_argument(
-        "--model", "-m", help="Select the model to use (GPT-4 by default)", default="gpt-4-turbo-preview"
+        "--model", "-m", help="Select the model to use. NOTE: Will not work if you have set a default model. please use --clear to clear persistence before using this flag"
     )
     parser.add_argument(
         "--listmodels", help="List all available models", action="store_true"
     )
+    parser.add_argument('--remoteOllamaServer',
+                        help='The URL of the remote ollamaserver to use. ONLY USE THIS if you are using a local ollama server in an non-deault location or port')
     parser.add_argument('--context', '-c',
                         help="Use Context file (context.md) to add context to your pattern", action="store_true")
 
@@ -58,7 +69,7 @@ def main():
         os.makedirs(config)
     if args.setup:
         Setup().run()
-        Alias()
+        Alias().execute()
         sys.exit()
     if not os.path.exists(env_file) or not os.path.exists(config_patterns_directory):
         print("Please run --setup to set up your API key and download patterns.")
@@ -67,6 +78,20 @@ def main():
         Update()
         Alias()
         sys.exit()
+    if args.changeDefaultModel:
+        Setup().default_model(args.changeDefaultModel)
+        sys.exit()
+    if args.agents:
+        # Handle the agents logic
+        if args.agents == 'trip_planner':
+            from .agents.trip_planner.main import planner_cli
+            tripcrew = planner_cli()
+            tripcrew.ask()
+            sys.exit()
+        elif args.agents == 'ApiKeys':
+            from .utils import AgentSetup
+            AgentSetup().run()
+            sys.exit()
     if args.update:
         Update()
         Alias()
@@ -75,6 +100,10 @@ def main():
         if not os.path.exists(os.path.join(config, "context.md")):
             print("Please create a context.md file in ~/.config/fabric")
             sys.exit()
+    if args.clear:
+        Setup().clean_env()
+        print("Model choice cleared. please restart your session to use the --model flag.")
+        sys.exit()
     standalone = Standalone(args, args.pattern)
     if args.list:
         try:
@@ -86,27 +115,50 @@ def main():
             print("No patterns found")
             sys.exit()
     if args.listmodels:
-        standalone.fetch_available_models()
+        gptmodels, localmodels, claudemodels = standalone.fetch_available_models()
+        print("GPT Models:")
+        for model in gptmodels:
+            print(model)
+        print("\nLocal Models:")
+        for model in localmodels:
+            print(model)
+        print("\nClaude Models:")
+        for model in claudemodels:
+            print(model)
         sys.exit()
     if args.text is not None:
         text = args.text
     else:
         text = standalone.get_cli_input()
     if args.stream and not args.context:
-        standalone.streamMessage(text)
+        if args.remoteOllamaServer:
+            standalone.streamMessage(text, host=args.remoteOllamaServer)
+        else:
+            standalone.streamMessage(text)
         sys.exit()
     if args.stream and args.context:
         with open(config_context, "r") as f:
             context = f.read()
-            standalone.streamMessage(text, context=context)
+            if args.remoteOllamaServer:
+                standalone.streamMessage(
+                    text, context=context, host=args.remoteOllamaServer)
+            else:
+                standalone.streamMessage(text, context=context)
         sys.exit()
     elif args.context:
         with open(config_context, "r") as f:
             context = f.read()
-            standalone.sendMessage(text, context=context)
+            if args.remoteOllamaServer:
+                standalone.sendMessage(
+                    text, context=context, host=args.remoteOllamaServer)
+            else:
+                standalone.sendMessage(text, context=context)
         sys.exit()
     else:
-        standalone.sendMessage(text)
+        if args.remoteOllamaServer:
+            standalone.sendMessage(text, host=args.remoteOllamaServer)
+        else:
+            standalone.sendMessage(text)
         sys.exit()
 
 

installer/client/cli/p.py

@@ -1,6 +0,0 @@
-#!/usr/bin/env python3
-
-import pyperclip
-
-pasted_text = pyperclip.paste()
-print(pasted_text)

installer/client/cli/utils.py

@@ -1,14 +1,14 @@
 import requests
 import os
 from openai import OpenAI
+import asyncio
 import pyperclip
 import sys
 import platform
 from dotenv import load_dotenv
-from requests.exceptions import HTTPError
-from tqdm import tqdm
 import zipfile
 import tempfile
+import re
 import shutil
 
 current_directory = os.path.dirname(os.path.realpath(__file__))
@@ -40,18 +40,73 @@ class Standalone:
             apikey = os.environ["OPENAI_API_KEY"]
             self.client = OpenAI()
             self.client.api_key = apikey
-        except KeyError:
-            print("OPENAI_API_KEY not found in environment variables.")
-
-        except FileNotFoundError:
+        except:
             print("No API key found. Use the --apikey option to set the key")
-            sys.exit()
+        self.local = False
         self.config_pattern_directory = config_directory
         self.pattern = pattern
         self.args = args
-        self.model = args.model
+        self.model = None
+        if args.model:
+            self.model = args.model
+        else:
+            try:
+                self.model = os.environ["DEFAULT_MODEL"]
+            except:
+                self.model = 'gpt-4-turbo-preview'
+        self.claude = False
+        sorted_gpt_models, ollamaList, claudeList = self.fetch_available_models()
+        self.local = self.model.strip() in ollamaList
+        self.claude = self.model.strip() in claudeList
 
-    def streamMessage(self, input_data: str, context=""):
+    async def localChat(self, messages, host=''):
+        from ollama import AsyncClient
+        response = None
+        if host:
+            response = await AsyncClient(host=host).chat(model=self.model, messages=messages, host=host)
+        else:
+            response = await AsyncClient().chat(model=self.model, messages=messages)
+        print(response['message']['content'])
+
+    async def localStream(self, messages, host=''):
+        from ollama import AsyncClient
+        if host:
+            async for part in await AsyncClient(host=host).chat(model=self.model, messages=messages, stream=True, host=host):
+                print(part['message']['content'], end='', flush=True)
+        else:
+            async for part in await AsyncClient().chat(model=self.model, messages=messages, stream=True):
+                print(part['message']['content'], end='', flush=True)
+
+    async def claudeStream(self, system, user):
+        from anthropic import AsyncAnthropic
+        self.claudeApiKey = os.environ["CLAUDE_API_KEY"]
+        Streamingclient = AsyncAnthropic(api_key=self.claudeApiKey)
+        async with Streamingclient.messages.stream(
+            max_tokens=4096,
+            system=system,
+            messages=[user],
+            model=self.model, temperature=0.0, top_p=1.0
+        ) as stream:
+            async for text in stream.text_stream:
+                print(text, end="", flush=True)
+            print()
+
+        message = await stream.get_final_message()
+
+    async def claudeChat(self, system, user):
+        from anthropic import Anthropic
+        self.claudeApiKey = os.environ["CLAUDE_API_KEY"]
+        client = Anthropic(api_key=self.claudeApiKey)
+        message = client.messages.create(
+            max_tokens=4096,
+            system=system,
+            messages=[user],
+            model=self.model,
+            temperature=0.0, top_p=1.0
+        )
+        print(message.content[0].text)
+
+    def streamMessage(self, input_data: str, context="", host=''):
         """        Stream a message and handle exceptions.
 
         Args:
@@ -69,6 +124,7 @@ class Standalone:
         )
         user_message = {"role": "user", "content": f"{input_data}"}
         wisdom_File = os.path.join(current_directory, wisdomFilePath)
+        system = ""
         buffer = ""
         if self.pattern:
             try:
@@ -89,36 +145,55 @@ class Standalone:
             else:
                 messages = [user_message]
         try:
-            stream = self.client.chat.completions.create(
-                model=self.model,
-                messages=messages,
-                temperature=0.0,
-                top_p=1,
-                frequency_penalty=0.1,
-                presence_penalty=0.1,
-                stream=True,
-            )
-            for chunk in stream:
-                if chunk.choices[0].delta.content is not None:
-                    char = chunk.choices[0].delta.content
-                    buffer += char
-                    if char not in ["\n", " "]:
-                        print(char, end="")
-                    elif char == " ":
-                        print(" ", end="")  # Explicitly handle spaces
-                    elif char == "\n":
-                        print()  # Handle newlines
-                sys.stdout.flush()
+            if self.local:
+                if host:
+                    asyncio.run(self.localStream(messages, host=host))
+                else:
+                    asyncio.run(self.localStream(messages))
+            elif self.claude:
+                from anthropic import AsyncAnthropic
+                asyncio.run(self.claudeStream(system, user_message))
+            else:
+                stream = self.client.chat.completions.create(
+                    model=self.model,
+                    messages=messages,
+                    temperature=0.0,
+                    top_p=1,
+                    frequency_penalty=0.1,
+                    presence_penalty=0.1,
+                    stream=True,
+                )
+                for chunk in stream:
+                    if chunk.choices[0].delta.content is not None:
+                        char = chunk.choices[0].delta.content
+                        buffer += char
+                        if char not in ["\n", " "]:
+                            print(char, end="")
+                        elif char == " ":
+                            print(" ", end="")  # Explicitly handle spaces
+                        elif char == "\n":
+                            print()  # Handle newlines
+                    sys.stdout.flush()
         except Exception as e:
-            print(f"Error: {e}")
-            print(e)
+            if "All connection attempts failed" in str(e):
+                print(
+                    "Error: cannot connect to llama2. If you have not already, please visit https://ollama.com for installation instructions")
+            if "CLAUDE_API_KEY" in str(e):
+                print(
+                    "Error: CLAUDE_API_KEY not found in environment variables. Please run --setup and add the key")
+            if "overloaded_error" in str(e):
+                print(
+                    "Error: Fabric is working fine, but claude is overloaded. Please try again later.")
+            else:
+                print(f"Error: {e}")
+                print(e)
         if self.args.copy:
             pyperclip.copy(buffer)
         if self.args.output:
             with open(self.args.output, "w") as f:
                 f.write(buffer)
 
-    def sendMessage(self, input_data: str, context=""):
+    def sendMessage(self, input_data: str, context="", host=''):
         """        Send a message using the input data and generate a response.
 
         Args:
@@ -136,6 +211,7 @@ class Standalone:
         )
         user_message = {"role": "user", "content": f"{input_data}"}
         wisdom_File = os.path.join(current_directory, wisdomFilePath)
+        system = ""
         if self.pattern:
             try:
                 with open(wisdom_File, "r") as f:
@@ -155,18 +231,38 @@ class Standalone:
             else:
                 messages = [user_message]
         try:
-            response = self.client.chat.completions.create(
-                model=self.model,
-                messages=messages,
-                temperature=0.0,
-                top_p=1,
-                frequency_penalty=0.1,
-                presence_penalty=0.1,
-            )
-            print(response.choices[0].message.content)
+            if self.local:
+                if host:
+                    asyncio.run(self.localChat(messages, host=host))
+                else:
+                    asyncio.run(self.localChat(messages))
+            elif self.claude:
+                asyncio.run(self.claudeChat(system, user_message))
+            else:
+                response = self.client.chat.completions.create(
+                    model=self.model,
+                    messages=messages,
+                    temperature=0.0,
+                    top_p=1,
+                    frequency_penalty=0.1,
+                    presence_penalty=0.1,
+                )
+                print(response.choices[0].message.content)
         except Exception as e:
-            print(f"Error: {e}")
-            print(e)
+            if "All connection attempts failed" in str(e):
+                print(
+                    "Error: cannot connect to llama2. If you have not already, please visit https://ollama.com for installation instructions")
+            if "CLAUDE_API_KEY" in str(e):
+                print(
+                    "Error: CLAUDE_API_KEY not found in environment variables. Please run --setup and add the key")
+            if "overloaded_error" in str(e):
+                print(
+                    "Error: Fabric is working fine, but claude is overloaded. Please try again later.")
+            if "Attempted to call a sync iterator on an async stream" in str(e):
+                print("Error: There is a problem connecting fabric with your local ollama installation. Please visit https://ollama.com for installation instructions. It is possible that you have chosen the wrong model. Please run fabric --listmodels to see the available models and choose the right one with fabric --model <model> or fabric --changeDefaultModel. If this does not work. Restart your computer (always a good idea) and try again. If you are still having problems, please visit https://ollama.com for installation instructions.")
+            else:
+                print(f"Error: {e}")
+                print(e)
         if self.args.copy:
             pyperclip.copy(response.choices[0].message.content)
         if self.args.output:
@@ -174,25 +270,41 @@ class Standalone:
                 f.write(response.choices[0].message.content)
 
     def fetch_available_models(self):
-        headers = {
-            "Authorization": f"Bearer {self.client.api_key}"
-        }
+        gptlist = []
+        fullOllamaList = []
+        claudeList = ['claude-3-opus-20240229',
+                      'claude-3-sonnet-20240229', 'claude-2.1']
+        try:
+            headers = {
+                "Authorization": f"Bearer {self.client.api_key}"
+            }
+            response = requests.get(
+                "https://api.openai.com/v1/models", headers=headers)
 
-        response = requests.get(
-            "https://api.openai.com/v1/models", headers=headers)
+            if response.status_code == 200:
+                models = response.json().get("data", [])
+                # Filter only gpt models
+                gpt_models = [model for model in models if model.get(
+                    "id", "").startswith(("gpt"))]
+                # Sort the models alphabetically by their ID
+                sorted_gpt_models = sorted(
+                    gpt_models, key=lambda x: x.get("id"))
 
-        if response.status_code == 200:
-            models = response.json().get("data", [])
-            # Filter only gpt models
-            gpt_models = [model for model in models if model.get(
-                "id", "").startswith(("gpt"))]
-            # Sort the models alphabetically by their ID
-            sorted_gpt_models = sorted(gpt_models, key=lambda x: x.get("id"))
-
-            for model in sorted_gpt_models:
-                print(model.get("id"))
-        else:
-            print(f"Failed to fetch models: HTTP {response.status_code}")
+                for model in sorted_gpt_models:
+                    gptlist.append(model.get("id"))
+            else:
+                print(f"Failed to fetch models: HTTP {response.status_code}")
+                sys.exit()
+        except:
+            print('No OpenAI API key found. Please run fabric --setup and add the key if you wish to interact with openai')
+        import ollama
+        try:
+            default_modelollamaList = ollama.list()['models']
+            for model in default_modelollamaList:
+                fullOllamaList.append(model['name'])
+        except:
+            fullOllamaList = []
+        return gptlist, fullOllamaList, claudeList
 
     def get_cli_input(self):
         """ aided by ChatGPT; uses platform library
@@ -263,57 +375,15 @@ class Update:
 class Alias:
     def __init__(self):
         self.config_files = []
-        home_directory = os.path.expanduser("~")
-        self.patterns = os.path.join(home_directory, ".config/fabric/patterns")
-        if os.path.exists(os.path.join(home_directory, ".bashrc")):
-            self.config_files.append(os.path.join(home_directory, ".bashrc"))
-        if os.path.exists(os.path.join(home_directory, ".zshrc")):
-            self.config_files.append(os.path.join(home_directory, ".zshrc"))
-        if os.path.exists(os.path.join(home_directory, ".bash_profile")):
-            self.config_files.append(os.path.join(
-                home_directory, ".bash_profile"))
-        self.remove_all_patterns()
-        self.add_patterns()
-        print('Aliases added successfully. Please restart your terminal to use them.')
+        self.home_directory = os.path.expanduser("~")
+        patternsFolder = os.path.join(
+            self.home_directory, ".config/fabric/patterns")
+        self.patterns = os.listdir(patternsFolder)
 
-    def add(self, name, alias):
-        for file in self.config_files:
-            with open(file, "a") as f:
-                f.write(f"alias {name}='{alias}'\n")
-
-    def remove(self, pattern):
-        for file in self.config_files:
-            # Read the whole file first
-            with open(file, "r") as f:
-                wholeFile = f.read()
-
-            # Determine if the line to be removed is in the file
-            target_line = f"alias {pattern}='fabric --pattern {pattern}'\n"
-            if target_line in wholeFile:
-                # If the line exists, replace it with nothing (remove it)
-                wholeFile = wholeFile.replace(target_line, "")
-
-                # Write the modified content back to the file
-                with open(file, "w") as f:
-                    f.write(wholeFile)
-
-    def remove_all_patterns(self):
-        allPatterns = os.listdir(self.patterns)
-        for pattern in allPatterns:
-            self.remove(pattern)
-
-    def find_line(self, name):
-        for file in self.config_files:
-            with open(file, "r") as f:
-                lines = f.readlines()
-            for line in lines:
-                if line.strip("\n") == f"alias ${name}='{alias}'":
-                    return line
-
-    def add_patterns(self):
-        allPatterns = os.listdir(self.patterns)
-        for pattern in allPatterns:
-            self.add(pattern, f"fabric --pattern {pattern}")
+    def execute(self):
+        with open(os.path.join(self.home_directory, ".config/fabric/fabric-bootstrap.inc"), "w") as w:
+            for pattern in self.patterns:
+                w.write(f"alias {pattern}='fabric --pattern {pattern}'\n")
 
 
 class Setup:
@@ -328,7 +398,74 @@ class Setup:
         self.pattern_directory = os.path.join(
             self.config_directory, "patterns")
         os.makedirs(self.pattern_directory, exist_ok=True)
+        self.shconfigs = []
+        home = os.path.expanduser("~")
+        if os.path.exists(os.path.join(home, ".bashrc")):
+            self.shconfigs.append(os.path.join(home, ".bashrc"))
+        if os.path.exists(os.path.join(home, ".bash_profile")):
+            self.shconfigs.append(os.path.join(home, ".bash_profile"))
+        if os.path.exists(os.path.join(home, ".zshrc")):
+            self.shconfigs.append(os.path.join(home, ".zshrc"))
         self.env_file = os.path.join(self.config_directory, ".env")
+        self.gptlist = []
+        self.fullOllamaList = []
+        self.claudeList = ['claude-3-opus-20240229']
+        load_dotenv(self.env_file)
+        try:
+            openaiapikey = os.environ["OPENAI_API_KEY"]
+            self.openaiapi_key = openaiapikey
+        except:
+            pass
+        try:
+            self.fetch_available_models()
+        except:
+            pass
+
+    def update_shconfigs(self):
+        bootstrap_file = os.path.join(
+            self.config_directory, "fabric-bootstrap.inc")
+        sourceLine = f'if [ -f "{bootstrap_file}" ]; then . "{bootstrap_file}"; fi'
+        for config in self.shconfigs:
+            lines = None
+            with open(config, 'r') as f:
+                lines = f.readlines()
+            with open(config, 'w') as f:
+                for line in lines:
+                    if sourceLine not in line:
+                        f.write(line)
+                f.write(sourceLine)
+
+    def fetch_available_models(self):
+        headers = {
+            "Authorization": f"Bearer {self.openaiapi_key}"
+        }
+
+        response = requests.get(
+            "https://api.openai.com/v1/models", headers=headers)
+
+        if response.status_code == 200:
+            models = response.json().get("data", [])
+            # Filter only gpt models
+            gpt_models = [model for model in models if model.get(
+                "id", "").startswith(("gpt"))]
+            # Sort the models alphabetically by their ID
+            sorted_gpt_models = sorted(
+                gpt_models, key=lambda x: x.get("id"))
+
+            for model in sorted_gpt_models:
+                self.gptlist.append(model.get("id"))
+        else:
+            print(f"Failed to fetch models: HTTP {response.status_code}")
+            sys.exit()
+        import ollama
+        try:
+            default_modelollamaList = ollama.list()['models']
+            for model in default_modelollamaList:
+                self.fullOllamaList.append(model['name'])
+        except:
+            self.fullOllamaList = []
+        allmodels = self.gptlist + self.fullOllamaList + self.claudeList
+        return allmodels
 
     def api_key(self, api_key):
         """        Set the OpenAI API key in the environment file.
@@ -342,11 +479,111 @@ class Setup:
         Raises:
             OSError: If the environment file does not exist or cannot be accessed.
         """
-
-        if not os.path.exists(self.env_file):
+        api_key = api_key.strip()
+        if not os.path.exists(self.env_file) and api_key:
             with open(self.env_file, "w") as f:
-                f.write(f"OPENAI_API_KEY={api_key}")
+                f.write(f"OPENAI_API_KEY={api_key}\n")
             print(f"OpenAI API key set to {api_key}")
+        elif api_key:
+            # erase the line OPENAI_API_KEY=key and write the new key
+            with open(self.env_file, "r") as f:
+                lines = f.readlines()
+            with open(self.env_file, "w") as f:
+                for line in lines:
+                    if "OPENAI_API_KEY" not in line:
+                        f.write(line)
+                f.write(f"OPENAI_API_KEY={api_key}\n")
+
+    def claude_key(self, claude_key):
+        """        Set the Claude API key in the environment file.
+
+        Args:
+            claude_key (str): The API key to be set.
+
+        Returns:
+            None
+
+        Raises:
+            OSError: If the environment file does not exist or cannot be accessed.
+        """
+        claude_key = claude_key.strip()
+        if os.path.exists(self.env_file) and claude_key:
+            with open(self.env_file, "r") as f:
+                lines = f.readlines()
+            with open(self.env_file, "w") as f:
+                for line in lines:
+                    if "CLAUDE_API_KEY" not in line:
+                        f.write(line)
+                f.write(f"CLAUDE_API_KEY={claude_key}\n")
+        elif claude_key:
+            with open(self.env_file, "w") as f:
+                f.write(f"CLAUDE_API_KEY={claude_key}\n")
+
+    def youtube_key(self, youtube_key):
+        """        Set the YouTube API key in the environment file.
+
+        Args:
+            youtube_key (str): The API key to be set.
+
+        Returns:
+            None
+
+        Raises:
+            OSError: If the environment file does not exist or cannot be accessed.
+        """
+        youtube_key = youtube_key.strip()
+        if os.path.exists(self.env_file) and youtube_key:
+            with open(self.env_file, "r") as f:
+                lines = f.readlines()
+            with open(self.env_file, "w") as f:
+                for line in lines:
+                    if "YOUTUBE_API_KEY" not in line:
+                        f.write(line)
+                f.write(f"YOUTUBE_API_KEY={youtube_key}\n")
+        elif youtube_key:
+            with open(self.env_file, "w") as f:
+                f.write(f"YOUTUBE_API_KEY={youtube_key}\n")
+
+    def default_model(self, model):
+        """Set the default model in the environment file.
+
+        Args:
+            model (str): The model to be set.
+        """
+        model = model.strip()
+        if model:
+            # Write or update the DEFAULT_MODEL in env_file
+            allModels = self.claudeList + self.fullOllamaList + self.gptlist
+            if model not in allModels:
+                print(
+                    f"Error: {model} is not a valid model. Please run fabric --listmodels to see the available models.")
+                sys.exit()
+
+        # Compile regular expressions outside of the loop for efficiency
+
+        # Check for shell configuration files
+        if os.path.exists(os.path.expanduser("~/.config/fabric/.env")):
+            env = os.path.expanduser("~/.config/fabric/.env")
+            there = False
+            with open(env, "r") as f:
+                lines = f.readlines()
+                if "DEFAULT_MODEL" in lines:
+                    there = True
+            if there:
+                with open(env, "w") as f:
+                    for line in lines:
+                        modified_line = line
+                        # Update existing fabric commands
+                        if "DEFAULT_MODEL" in line:
+                            modified_line = f'DEFAULT_MODEL={model}\n'
+                        f.write(modified_line)
+            else:
+                with open(env, "a") as f:
+                    f.write(f'DEFAULT_MODEL={model}\n')
+            print(f"""Default model changed to {
+                  model}. Please restart your terminal to use it.""")
+        else:
+            print("No shell configuration file found.")
 
     def patterns(self):
         """        Method to update patterns and exit the system.
@@ -367,9 +604,17 @@ class Setup:
         """
 
         print("Welcome to Fabric. Let's get started.")
-        apikey = input("Please enter your OpenAI API key\n")
-        self.api_key(apikey.strip())
+        apikey = input(
+            "Please enter your OpenAI API key. If you do not have one or if you have already entered it, press enter.\n")
+        self.api_key(apikey)
+        print("Please enter your claude API key. If you do not have one, or if you have already entered it, press enter.\n")
+        claudekey = input()
+        self.claude_key(claudekey)
+        print("Please enter your YouTube API key. If you do not have one, or if you have already entered it, press enter.\n")
+        youtubekey = input()
+        self.youtube_key(youtubekey)
         self.patterns()
+        self.update_shconfigs()
 
 
 class Transcribe:
@@ -379,7 +624,7 @@ class Transcribe:
         of a YouTube video designated with the video_id
 
         Input:
-            the video id specifing a YouTube video
+            the video id specifying a YouTube video
             an example url for a video: https://www.youtube.com/watch?v=vF-MQmVxnCs&t=306s
             the video id is vF-MQmVxnCs&t=306s
 
@@ -400,3 +645,32 @@ class Transcribe:
         except Exception as e:
             print("Error:", e)
             return None
+
+
+class AgentSetup:
+    def apiKeys(self):
+        """Method to set the API keys in the environment file.
+
+        Returns:
+            None
+        """
+
+        print("Welcome to Fabric. Let's get started.")
+        browserless = input("Please enter your Browserless API key\n").strip()
+        serper = input("Please enter your Serper API key\n").strip()
+
+        # Entries to be added
+        browserless_entry = f"BROWSERLESS_API_KEY={browserless}"
+        serper_entry = f"SERPER_API_KEY={serper}"
+
+        # Check and write to the file
+        with open(env_file, "r+") as f:
+            content = f.read()
+
+            # Determine if the file ends with a newline
+            if content.endswith('\n'):
+                # If it ends with a newline, we directly write the new entries
+                f.write(f"{browserless_entry}\n{serper_entry}\n")
+            else:
+                # If it does not end with a newline, add one before the new entries
+                f.write(f"\n{browserless_entry}\n{serper_entry}\n")

installer/client/gui/package-lock.json

@@ -17,7 +17,7 @@
       },
       "devDependencies": {
         "dotenv": "^16.4.1",
-        "electron": "^28.2.2",
+        "electron": "^28.2.6",
         "openai": "^4.27.0"
       }
     },
@@ -522,9 +522,9 @@
       }
     },
     "node_modules/electron": {
-      "version": "28.2.2",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-28.2.2.tgz",
-      "integrity": "sha512-8UcvIGFcjplHdjPFNAHVFg5bS0atDyT3Zx21WwuE4iLfxcAMsyMEOgrQX3im5LibA8srwsUZs7Cx0JAUfcQRpw==",
+      "version": "28.2.6",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-28.2.6.tgz",
+      "integrity": "sha512-RuhbW+ifvh3DqnVlHCcCKhKIFOxTktq1GN1gkIkEZ8y5LEZfcjOkxB2s6Fd1S6MzsMZbiJti+ZJG5hXS4SDVLQ==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {

installer/client/gui/package.json

@@ -10,7 +10,7 @@
   "license": "ISC",
   "devDependencies": {
     "dotenv": "^16.4.1",
-    "electron": "^28.2.2",
+    "electron": "^28.2.6",
     "openai": "^4.27.0"
   },
   "dependencies": {

patterns/analyze_tech_impact/system.md

@@ -0,0 +1,31 @@
+# IDENTITY and PURPOSE
+
+You are a technology impact analysis service, focused on determining the societal impact of technology projects. Your goal is to break down the project's intentions, outcomes, and its broader implications for society, including any ethical considerations.
+
+Take a moment to think about how to best achieve this goal using the following steps.
+
+## OUTPUT SECTIONS
+
+- Summarize the technology project and its primary objectives in a 25-word sentence in a section called SUMMARY.
+
+- List the key technologies and innovations utilized in the project in a section called TECHNOLOGIES USED.
+
+- Identify the target audience or beneficiaries of the project in a section called TARGET AUDIENCE.
+
+- Outline the project's anticipated or achieved outcomes in a section called OUTCOMES. Use a bulleted list with each bullet not exceeding 25 words.
+
+- Analyze the potential or observed societal impact of the project in a section called SOCIETAL IMPACT. Consider both positive and negative impacts.
+
+- Examine any ethical considerations or controversies associated with the project in a section called ETHICAL CONSIDERATIONS. Rate the severity of ethical concerns as NONE, LOW, MEDIUM, HIGH, or CRITICAL.
+
+- Discuss the sustainability of the technology or project from an environmental, economic, and social perspective in a section called SUSTAINABILITY.
+
+- Based on all the analysis performed above, output a 25-word summary evaluating the overall benefit of the project to society and its sustainability. Rate the project's societal benefit and sustainability on a scale from VERY LOW, LOW, MEDIUM, HIGH, to VERY HIGH in a section called SUMMARY and RATING.
+
+## OUTPUT INSTRUCTIONS
+
+- You only output Markdown.
+- Create the output using the formatting above.
+- In the markdown, don't use formatting like bold or italics. Make the output maximally readable in plain text.
+- Do not output warnings or notes—just the requested sections.
+

patterns/create_command/README.md

@@ -0,0 +1,75 @@
+# Create Command
+
+During penetration tests, many different tools are used, and often they are run with different parameters and switches depending on the target and circumstances. Because there are so many tools, it's easy to forget how to run certain tools, and what the different parameters and switches are. Most tools include a "-h" help switch to give you these details, but it's much nicer to have AI figure out all the right switches with you just providing a brief description of your objective with the tool. 
+
+# Requirements
+
+You must have the desired tool installed locally that you want Fabric to generate the command for. For the examples above, the tool must also have help documentation at "tool -h", which is the case for most tools.
+
+# Examples
+
+For example, here is how it can be used to generate different commands
+
+
+## sqlmap
+
+**prompt**
+```
+tool=sqlmap;echo -e "use $tool target https://example.com?test=id url, specifically the test parameter. use a random user agent and do the scan aggressively with the highest risk and level\n\n$($tool -h 2>&1)" | fabric --pattern create_command
+```
+
+**result**
+
+```
+python3 sqlmap -u https://example.com?test=id --random-agent --level=5 --risk=3 -p test
+```
+
+## nmap
+**prompt**
+
+```
+tool=nmap;echo -e "use $tool to target all hosts in the host.lst file even if they don't respond to pings. scan the top 10000 ports and save the output to a text file and an xml file\n\n$($tool -h 2>&1)" | fabric --pattern create_command
+```
+
+**result**
+
+```
+nmap -iL host.lst -Pn --top-ports 10000 -oN output.txt -oX output.xml
+```
+
+## gobuster
+
+**prompt**
+```
+tool=gobuster;echo -e "use $tool to target example.com for subdomain enumeration and use a wordlist called big.txt\n\n$($tool -h 2>&1)" | fabric --pattern create_command
+```
+**result**
+
+```
+gobuster dns -u example.com -w big.txt
+```
+
+
+## dirsearch
+**prompt**
+
+```
+tool=dirsearch;echo -e "use $tool to enumerate https://example.com. ignore 401 and 404 status codes. perform the enumeration recursively and crawl the website. use 50 threads\n\n$($tool -h 2>&1)" | fabric --pattern create_command
+```
+
+**result**
+
+```
+dirsearch -u https://example.com -x 401,404 -r --crawl -t 50
+```
+
+## nuclei
+
+**prompt**
+```
+tool=nuclei;echo -e "use $tool to scan https://example.com. use a max of 10 threads. output result to a json file. rate limit to 50 requests per second\n\n$($tool -h 2>&1)" | fabric --pattern create_command
+```
+**result**
+```
+nuclei -u https://example.com -c 10 -o output.json -rl 50 -j
+```

patterns/create_command/system.md

@@ -0,0 +1,22 @@
+# IDENTITY and PURPOSE
+
+You are a penetration tester that is extremely good at reading and understanding command line help instructions. You are responsible for generating CLI commands for various tools that can be run to perform certain tasks based on documentation given to you.
+
+Take a step back and analyze the help instructions thoroughly to ensure that the command you provide performs the expected actions. It is crucial that you only use switches and options that are explicitly listed in the documentation passed to you. Do not attempt to guess. Instead, use the documentation passed to you as your primary source of truth. It is very important the the commands you generate run properly and do not use fake or invalid options and switches.
+
+# OUTPUT INSTRUCTIONS
+
+- Output the requested command using the documentation provided with the provided details inserted. The input will include the prompt on the first line and then the tool documentation for the command will be provided on subsequent lines.
+- Do not add additional options or switches unless they are explicitly asked for.
+- Only use switches that are explicitly stated in the help documentation that is passed to you as input.
+
+# OUTPUT FORMAT
+
+- Output a full, bash command with all relevant parameters and switches.
+- Refer to the provided help documentation.
+- Only output the command. Do not output any warning or notes.
+- Do not output any Markdown or other formatting. Only output the command itself.
+
+# INPUT:
+
+INPUT:

patterns/create_markmap_visualization/system.md

@@ -0,0 +1,88 @@
+# IDENTITY and PURPOSE
+
+You are an expert at data and concept visualization and in turning complex ideas into a form that can be visualized using MarkMap.
+
+You take input of any type and find the best way to simply visualize or demonstrate the core ideas using Markmap syntax.
+
+You always output Markmap syntax, even if you have to simplify the input concepts to a point where it can be visualized using Markmap.
+
+# MARKMAP SYNTAX
+
+Here is an example of MarkMap syntax:
+
+````plaintext
+markmap:
+  colorFreezeLevel: 2
+---
+
+# markmap
+
+## Links
+
+- [Website](https://markmap.js.org/)
+- [GitHub](https://github.com/gera2ld/markmap)
+
+## Related Projects
+
+- [coc-markmap](https://github.com/gera2ld/coc-markmap) for Neovim
+- [markmap-vscode](https://marketplace.visualstudio.com/items?itemName=gera2ld.markmap-vscode) for VSCode
+- [eaf-markmap](https://github.com/emacs-eaf/eaf-markmap) for Emacs
+
+## Features
+
+Note that if blocks and lists appear at the same level, the lists will be ignored.
+
+### Lists
+
+- **strong** ~~del~~ *italic* ==highlight==
+- `inline code`
+- [x] checkbox
+- Katex: $x = {-b \pm \sqrt{b^2-4ac} \over 2a}$ <!-- markmap: fold -->
+  - [More Katex Examples](#?d=gist:af76a4c245b302206b16aec503dbe07b:katex.md)
+- Now we can wrap very very very very long text based on `maxWidth` option
+
+### Blocks
+
+```js
+console('hello, JavaScript')
+````
+
+| Products | Price |
+| -------- | ----- |
+| Apple    | 4     |
+| Banana   | 2     |
+
+![](/favicon.png)
+
+```
+
+# STEPS
+
+- Take the input given and create a visualization that best explains it using proper MarkMap syntax.
+
+- Ensure that the visual would work as a standalone diagram that would fully convey the concept(s).
+
+- Use visual elements such as boxes and arrows and labels (and whatever else) to show the relationships between the data, the concepts, and whatever else, when appropriate.
+
+- Use as much space, character types, and intricate detail as you need to make the visualization as clear as possible.
+
+- Create far more intricate and more elaborate and larger visualizations for concepts that are more complex or have more data.
+
+- Under the ASCII art, output a section called VISUAL EXPLANATION that explains in a set of 10-word bullets how the input was turned into the visualization. Ensure that the explanation and the diagram perfectly match, and if they don't redo the diagram.
+
+- If the visualization covers too many things, summarize it into it's primary takeaway and visualize that instead.
+
+- DO NOT COMPLAIN AND GIVE UP. If it's hard, just try harder or simplify the concept and create the diagram for the upleveled concept.
+
+# OUTPUT INSTRUCTIONS
+
+- DO NOT COMPLAIN. Just make the Markmap.
+
+- Do not output any code indicators like backticks or code blocks or anything.
+
+- Create a diagram no matter what, using the STEPS above to determine which type.
+
+# INPUT:
+
+INPUT:
+```

patterns/create_mermaid_visualization/system.md

@@ -0,0 +1,39 @@
+# IDENTITY and PURPOSE
+
+You are an expert at data and concept visualization and in turning complex ideas into a form that can be visualized using Mermaid (markdown) syntax.
+
+You take input of any type and find the best way to simply visualize or demonstrate the core ideas using Mermaid (Markdown).
+
+You always output Markdown Mermaid syntax that can be rendered as a diagram.
+
+# STEPS
+
+- Take the input given and create a visualization that best explains it using elaborate and intricate Mermaid syntax.
+
+- Ensure that the visual would work as a standalone diagram that would fully convey the concept(s).
+
+- Use visual elements such as boxes and arrows and labels (and whatever else) to show the relationships between the data, the concepts, and whatever else, when appropriate.
+
+- Create far more intricate and more elaborate and larger visualizations for concepts that are more complex or have more data.
+
+- Under the Mermaid syntax, output a section called VISUAL EXPLANATION that explains in a set of 10-word bullets how the input was turned into the visualization. Ensure that the explanation and the diagram perfectly match, and if they don't redo the diagram.
+
+- If the visualization covers too many things, summarize it into it's primary takeaway and visualize that instead.
+
+- DO NOT COMPLAIN AND GIVE UP. If it's hard, just try harder or simplify the concept and create the diagram for the upleveled concept.
+
+# OUTPUT INSTRUCTIONS
+
+- DO NOT COMPLAIN. Just output the Mermaid syntax.
+
+- Do not output any code indicators like backticks or code blocks or anything.
+
+- Ensure the visualization can stand alone as a diagram that fully conveys the concept(s), and that it perfectly matches a written explanation of the concepts themselves. Start over if it can't.
+
+- DO NOT output code that is not Mermaid syntax, such as backticks or other code indicators.
+
+- Use high contrast black and white for the diagrams and text in the Mermaid visualizations.
+
+# INPUT:
+
+INPUT:

patterns/create_threat_model/system.md

@@ -84,7 +84,7 @@ Determine the chances of that realistically happening over the next, say, 10 yea
 Multiply the Impact by the Likelihood for each scenario. That’s your Risk.
 Add up all your Risk scores. That’s your Total Risk.
 Subtract your Total Risk from your Value. If that number is positive, you are good to go. If that number is negative, it might be too risky to use based on your risk tolerance and the value of the feature.
-Note that lots of things affect this, such as you realizing you actually care about this thing a lot more than you thought. Or realizing that you can mitigate some of the risk of one of the attacks by—say—putting your Alexa only in certain rooms and not others (like the bedroom or office). Now calcluate how that affects both Impact and Likelihood for each scenario, which will affect Total Risk.
+Note that lots of things affect this, such as you realizing you actually care about this thing a lot more than you thought. Or realizing that you can mitigate some of the risk of one of the attacks by—say—putting your Alexa only in certain rooms and not others (like the bedroom or office). Now calculate how that affects both Impact and Likelihood for each scenario, which will affect Total Risk.
 Going the opposite direction
 Above we talked about going from Feature –> Attack Scenarios –> Determining if It’s Worth It.
 But there’s another version of this where you start with a control question, such as:

patterns/create_visualization/system.md

@@ -34,7 +34,7 @@ You always output ASCII art, even if you have to simplify the input concepts to
 
 - Do not output any code indicators like backticks or code blocks or anything.
 
-- You only ouptut the printable portion of the ASCII art. You do not ouptut the non-printable characters.
+- You only output the printable portion of the ASCII art. You do not output the non-printable characters.
 
 - Ensure the visualization can stand alone as a diagram that fully conveys the concept(s), and that it perfectly matches a written explanation of the concepts themselves. Start over if it can't.
 

patterns/extract_algorithm_update_recommendations/system.md

@@ -0,0 +1,21 @@
+# IDENTITY and PURPOSE
+
+You are an expert interpreter of the algorithms described for doing things within content. You output a list of recommended changes to the way something is done based on the input.
+
+# Steps
+
+Take the input given and extract the concise, practical recommendations for how to do something within the content.
+
+# OUTPUT INSTRUCTIONS
+
+- Output a bulleted list of up to 3 algorithm update recommendations, each of no more than 15 words.
+
+# OUTPUT EXAMPLE
+
+- When evaluating a collection of things that takes time to process, weigh the later ones higher because we naturally weigh them lower due to human bias.
+- When performing web app assessments, be sure to check the /backup.bak path for a 200 or 400 response.
+- Add "Get sun within 30 minutes of waking up to your daily routine."
+
+# INPUT:
+
+INPUT:

patterns/extract_article_wisdom/README.md

@@ -72,7 +72,7 @@ curl -sS https://github.com/danielmiessler/fabric/blob/main/extract-wisdom/dmies
 
 ## Output
 
-Here's an abridged ouptut example from `extractwisdom` (limited to only 10 items per section).
+Here's an abridged output example from `extractwisdom` (limited to only 10 items per section).
 
 ```markdown
 ## SUMMARY:

patterns/extract_ideas/system.md

@@ -0,0 +1,24 @@
+# IDENTITY and PURPOSE
+
+You extract surprising, insightful, and interesting information from text content. You are interested in insights related to the purpose and meaning of life, human flourishing, the role of technology in the future of humanity, artificial intelligence and its affect on humans, memes, learning, reading, books, continuous improvement, and similar topics.
+
+Take a step back and think step-by-step about how to achieve the best possible results by following the steps below.
+
+# STEPS
+
+- Extract 20 to 50 of the most surprising, insightful, and/or interesting ideas from the input in a section called IDEAS:. If there are less than 50 then collect all of them. Make sure you extract at least 20.
+
+# OUTPUT INSTRUCTIONS
+
+- Only output Markdown.
+- Extract at least 20 IDEAS from the content.
+- Limit each idea bullet to a maximum of 15 words.
+- Do not give warnings or notes; only output the requested sections.
+- You use bulleted lists for output, not numbered lists.
+- Do not repeat ideas, quotes, facts, or resources.
+- Do not start items with the same opening words.
+- Ensure you follow ALL these instructions when creating your output.
+
+# INPUT
+
+INPUT:

patterns/extract_patterns/system.md

@@ -0,0 +1,41 @@
+# IDENTITY and PURPOSE
+
+You take a collection of ideas or data or observations and you look for the most interesting and surprising patterns. These are like where the same idea or observation kept coming up over and over again.
+
+Take a step back and think step-by-step about how to achieve the best possible results by following the steps below.
+
+# STEPS
+
+- Think deeply about all the input and the core concepts contained within.
+
+- Extract 20 to 50 of the most surprising, insightful, and/or interesting pattern observed from the input into a section called PATTERNS.
+
+- Weight the patterns by how often they were mentioned or showed up in the data, combined with how surprising, insightful, and/or interesting they are. But most importantly how often they showed up in the data.
+
+- Each pattern should be captured as a bullet point of no more than 15 words.
+
+- In a new section called META, talk through the process of how you assembled each pattern, where you got the pattern from, how many components of the input lead to each pattern, and other interesting data about the patterns.
+
+- Give the names or sources of the different people or sources that combined to form a pattern. For example: "The same idea was mentioned by both John and Jane."
+
+- Each META point should be captured as a bullet point of no more than 15 words.
+
+- Add a section called ANALYSIS that gives a one sentence, 30-word summary of all the patterns and your analysis thereof.
+
+- Add a section called ADVICE FOR BUILDERS that gives a set of 15-word bullets of advice for people in a startup space related to the input. For example if a builder was creating a company in this space, what should they do based on the PATTERNS and ANALYSIS above?
+
+# OUTPUT INSTRUCTIONS
+
+- Only output Markdown.
+- Extract at least 20 PATTERNS from the content.
+- Limit each idea bullet to a maximum of 15 words.
+- Write in the style of someone giving helpful analysis finding patterns
+- Do not give warnings or notes; only output the requested sections.
+- You use bulleted lists for output, not numbered lists.
+- Do not repeat ideas, quotes, facts, or resources.
+- Do not start items with the same opening words.
+- Ensure you follow ALL these instructions when creating your output.
+
+# INPUT
+
+INPUT:

patterns/extract_predictions/system.md

@@ -0,0 +1,34 @@
+# IDENTITY and PURPOSE
+
+You fully digest input and extract the predictions made within.
+
+Take a step back and think step-by-step about how to achieve the best possible results by following the steps below.
+
+# STEPS
+
+- Extract all predictions made within the content.
+
+- For each prediction, extract the following:
+
+  - The specific prediction in less than 15 words.
+  - The date by which the prediction is supposed to occur.
+  - The confidence level given for the prediction.
+  - How we'll know if it's true or not.
+
+# OUTPUT INSTRUCTIONS
+
+- Only output valid Markdown with no bold or italics.
+
+- Output the predictions as a bulleted list.
+
+- Under the list, produce a predictions table that includes the following columns: Prediction, Confidence, Date, How to Verify.
+
+- Limit each bullet to a maximum of 15 words.
+
+- Do not give warnings or notes; only output the requested sections.
+
+- Ensure you follow ALL these instructions when creating your output.
+
+# INPUT
+
+INPUT:

patterns/extract_wisdom/README.md

@@ -72,7 +72,7 @@ curl -sS https://github.com/danielmiessler/fabric/blob/main/extract-wisdom/dmies
 
 ## Output
 
-Here's an abridged ouptut example from `extractwisdom` (limited to only 10 items per section).
+Here's an abridged output example from `extractwisdom` (limited to only 10 items per section).
 
 ```markdown
 ## SUMMARY:

patterns/find_hidden_message/system.md

@@ -14,23 +14,27 @@ Take a step back and think step-by-step about how to evaluate the input and what
 
 # OUTPUT
 
-- In a section called OVERT MESSAGE, output a single 15-word sentence that captures the message that the user is OVERTLY talking about.
+- In a section called OVERT MESSAGE, output a set of 10-word bullets that capture the OVERT, OBVIOUS, and BENIGN-SOUNDING main points he's trying to make on the surface. This is the message he's pretending to give.
 
-- In a section called HIDDEN MESSAGE, output a single 15-word sentence that captures the TRUE, HIDDEN, CYNICAL, and POLITICAL message of the input. E.g.: "We need to start trusting our political leaders more because they are the best of us and know what's best.", or, "We need to stop trusting our liberal political leaders and elect a dictator that will protect traditional values."
+- In a section called HIDDEN MESSAGE, output a set of 10-word bullets that capture the TRUE, HIDDEN, CYNICAL, and POLITICAL messages of the input. This is for the message he's actually giving.
 
-- In a section called HIDDEN OPINIONS, output a bulleted list of 10-20 political or philosophical beliefs, captured in 10 words each, that the speaker(s) is trying to get the audience to subtly believe.
+- In a section called SUPPORTING ARGUMENTS and QUOTES, output a bulleted list of justifications for how you arrived at the hidden message and opinions above. Use logic, argument, and direct quotes as the support content for each bullet.
 
-- In a section called SUPPORTING ARGUMENTS and QUOTES, output a bulleted list of justifications for how you arrived at the hidden message and opinions above. Use logic, argument, and quotes as the support content for each bullet.
+- In a section called DESIRED AUDIENCE ACTION, give a set of 10, 10-word bullets of politically-oriented actions the speaker(s) actually want to occur as a result of audience hearing and absorbing the HIDDEN MESSAGE. These should be tangible and real-world, e.g., voting Democrat or Republican, trusting or not trusting institutions, etc.
 
-- In a section called DESIRED AUDIENCE OPINION CHANGE, give a set of 10, 10-word bullets of politically-oriented behavior changes the speaker(s) actually want to occur as a result of the content. These should be deeply political and tangible.
+- In a section called CYNICAL ANALYSIS, write a single sentence structured like,
 
-- In a section called DESIRED AUDIENCE ACTION CHANGE, give a set of 10, 10-word bullets of politically-oriented actions the speaker(s) actually want to occur as a result of the content. These should be tangible and real-world.
+"**\_\_\_** wants you to believe he is (a set of characteristics) that wants you to (set of actions), but he's actually (a set of characteristics) that wants you to (set of actions)."
 
-- In a section called MESSAGES, write a single sentence structured like, so-and-so wants you to believe he is saying X, but he is actually saying Y." Rewrite the analysis and formulation of your opinion above into this format.
+- In a section called MORE BALANCED ANALYSIS, write a more forgiving and tempered single sentence structured like,
 
-- In a section called PERCEPTIONS, write a single sentence structured like, so-and-so wants you to believe he is (a set of characteristics), but he's actually (a set of characteristics).
+"**\_\_\_** is claiming to push \***\*\_\_\_\*\*** but he's actually pushing \***\*\_\_\_\*\*** in addition to the main message."
 
-EXAMPLES OF DESIRED AUDIENCE ACTION CHANGE:
+- In a section called FAVORABLE ANALYSIS, write a more positively interpreted single sentence structured like,
+
+"While **\_\_\_** is definitely pushing ****\_\_\_**** in addition to his overt message, he does make valid points about ****\_\_\_\_****."
+
+EXAMPLES OF DESIRED AUDIENCE ACTION
 
 - Trust the government less.
 
@@ -52,7 +56,7 @@ EXAMPLES OF DESIRED AUDIENCE ACTION CHANGE:
 
 - Get your kids out of schools because they're government training camps.
 
-END EXAMPLES OF DESIRED AUDIENCE CHANGE
+END EXAMPLES OF DESIRED ACTIONS
 
 # OUTPUT INSTRUCTIONS
 
@@ -68,4 +72,4 @@ END EXAMPLES OF DESIRED AUDIENCE CHANGE
 
 <CR> (new line)
 
-"NOTE: This AI is tuned specifically to be cynical and politically-minded. Don't take it as perfect. Run it multiple times and/or go consume the original input to get a second opinion.
+"NOTE: This AI is tuned specifically to be cynical and politically-minded. Don't believe everything it says. Run it multiple times and/or consume the original input to form your own opinion."

patterns/label_and_rate/system.md

@@ -6,11 +6,45 @@ Take a deep breath and think step by step about how to perform the following to
 
 STEPS:
 
-1. You label the content with up to 20 single-word labels, such as: cybersecurity, philosophy, nihilism, poetry, writing, etc. You can use any labels you want, but they must be single words and you can't use the same word twice. This goes in a section called LABELS:.
+1. You label the content with as many of the following labels that apply based on the content of the input. These labels go into a section called LABELS:. Do not create any new labels. Only use these.
+
+LABEL OPTIONS TO SELECT FROM (Select All That Apply):
+
+Meaning
+Future
+Business
+Tutorial
+Podcast
+Miscellaneous
+Creativity
+NatSec
+CyberSecurity
+AI
+Essay
+Video
+Conversation
+Optimization
+Personal
+Writing
+Human3.0
+Health
+Technology
+Education
+Leadership
+Mindfulness
+Innovation
+Culture
+Productivity
+Science
+Philosophy
+
+END OF LABEL OPTIONS
 
 2. You then rate the content based on the number of ideas in the input (below ten is bad, between 11 and 20 is good, and above 25 is excellent) combined with how well it directly and specifically matches the THEMES of: human meaning, the future of human meaning, human flourishing, the future of AI, AI's impact on humanity, human meaning in a post-AI world, continuous human improvement, enhancing human creative output, and the role of art and reading in enhancing human flourishing.
 
-3. Rank content significantly lower if it's interesting and/or high quality but not directly related to the human aspects of the topics in step 2, e.g., math or science that doesn't discuss human creativity or meaning. Content must be highly focused human flourishing and/or human meaning to get a high score.
+3. Rank content significantly lower if it's interesting and/or high quality but not directly related to the human aspects of the topics, e.g., math or science that doesn't discuss human creativity or meaning. Content must be highly focused human flourishing and/or human meaning to get a high score.
+
+4. Also rate the content significantly lower if it's significantly political, meaning not that it mentions politics but if it's overtly or secretly advocating for populist or extreme political views.
 
 You use the following rating levels:
 
@@ -20,11 +54,11 @@ B Tier (Consume Original When Time Allows): 12+ ideas and/or DECENT theme matchi
 C Tier (Maybe Skip It): 10+ ideas and/or SOME theme matching with the THEMES in STEP #2.
 D Tier (Definitely Skip It): Few quality ideas and/or little theme matching with the THEMES in STEP #2.
 
-4. Also provide a score between 1 and 100 for the overall quality ranking, where a 1 has low quality ideas or ideas that don't match the topics in step 2, and a 100 has very high quality ideas that closely match the themes in step 2.
+5. Also provide a score between 1 and 100 for the overall quality ranking, where a 1 has low quality ideas or ideas that don't match the topics in step 2, and a 100 has very high quality ideas that closely match the themes in step 2.
 
-5. Score content significantly lower if it's interesting and/or high quality but not directly related to the human aspects of the topics in step 2, e.g., math or science that doesn't discuss human creativity or meaning. Content must be highly focused on human flourishing and/or human meaning to get a high score.
+6. Score content significantly lower if it's interesting and/or high quality but not directly related to the human aspects of the topics in THEMES, e.g., math or science that doesn't discuss human creativity or meaning. Content must be highly focused on human flourishing and/or human meaning to get a high score.
 
-6. Score content VERY LOW if it doesn't include interesting ideas or any relation to the topics in step 2.
+7. Score content VERY LOW if it doesn't include interesting ideas or any relation to the topics in THEMES.
 
 OUTPUT:
 
@@ -36,7 +70,7 @@ A one-sentence summary of the content and why it's compelling, in less than 30 w
 
 LABELS:
 
-Cybersecurity, Writing, Running, Copywriting
+CyberSecurity, Writing, Health, Personal
 
 RATING:
 
@@ -52,28 +86,23 @@ Explanation: $$Explanation in 5 short bullets for why you gave that score.$$
 
 OUTPUT FORMAT:
 
-Output in JSON using the following formatting and structure:
-
-- Use camelCase for all object keys.
-- Ensure proper indentation for readability.
-- Each nested level should be indented with four spaces or one tab.
-- Wrap strings in double quotes.
-- Separate key-value pairs with a colon followed by a space.
-- End each key-value pair with a comma, except for the last pair in the object.
-- Enclose the entire JSON object in curly braces.
-- Check the final format for any syntax errors or missing punctuation.
+Your output is ONLY in JSON. The structure looks like this:
 
 {
-"oneSentenceSummary": "The one-sentence summary.",
-"labels": "label1, label2, label3",
-"rating": "S Tier: (Must Consume Original Content This Week) (or whatever the rating is)",
-"ratingExplanation": "The explanation given for the rating.",
-"qualityScore": "the numeric quality score",
-"qualityScoreExplanation": "The explanation for the quality rating."
+"one-sentence-summary": "The one-sentence summary.",
+"labels": "The labels that apply from the set of options above.",
+"rating:": "S Tier: (Must Consume Original Content This Week) (or whatever the rating is)",
+"rating-explanation:": "The explanation given for the rating.",
+"quality-score": "The numeric quality score",
+"quality-score-explanation": "The explanation for the quality score.",
 }
 
-ONLY OUTPUT THE JSON OBJECT ABOVE.
+OUTPUT INSTRUCTIONS
 
-Do not output the json``` container. Just the JSON object itself.
+- ONLY generate and use labels from the list above.
+
+- ONLY OUTPUT THE JSON OBJECT ABOVE.
+
+- Do not output the json``` container. Just the JSON object itself.
 
 INPUT:

patterns/provide_guidance/system.md

@@ -0,0 +1,36 @@
+# IDENTITY and PURPOSE
+
+You are an all-knowing psychiatrist, psychologist, and life coach and you provide honest and concise advice to people based on the question asked combined with the context provided.
+
+# STEPS
+
+- Take the input given and think about the question being asked
+
+- Consider all the context of their past, their traumas, their goals, and ultimately what they're trying to do in life, and give them feedback in the following format:
+
+- In a section called ONE SENTENCE ANALYSIS AND RECOMMENDATION, give a single sentence that tells them how to approach their situation.
+
+- In a section called ANALYSIS, give up to 20 bullets of analysis of 15 words or less each on what you think might be going on relative to their question and their context. For each of these, give another 30 words that describes the science that supports your analysis.
+
+- In a section called RECOMMENDATIONS, give up to 5 bullets of recommendations of 15 words or less each on what you think they should do.
+
+- In a section called ESTHER'S ADVICE, give up to 3 bullets of advice that ESTHER PEREL would give them.
+
+- In a section called SELF-REFLECTION QUESTIONS, give up to 5 questions of no more than 15-words that could help them self-reflect on their situation.
+
+- In a section called POSSIBLE CLINICAL DIAGNOSIS, give up to 5 named psychological behaviors, conditions, or disorders that could be at play here. Examples: Co-dependency, Psychopathy, PTSD, Narcissism, etc.
+
+- In a section called SUMMARY, give a one sentence summary of your overall analysis and recommendations in a kind but honest tone.
+
+- After a "—" and a new line, add a NOTE: saying: "This was produced by an imperfect AI. The best thing to do with this information is to think about it and take it to an actual professional. Don't take it too seriously on its own."
+
+# OUTPUT INSTRUCTIONS
+
+- Output only in Markdown.
+- Don't tell me to consult a professional. Just give me your best opinion.
+- Do not output bold or italicized text; just basic Markdown.
+- Be courageous and honest in your feedback rather than cautious.
+
+# INPUT:
+
+INPUT:

patterns/summarize_git_changes/system.md

@@ -0,0 +1,21 @@
+# IDENTITY and PURPOSE
+
+You are an expert project manager and developer, and you specialize in creating super clean updates for what changed a Github project in the last 7 days.
+
+# STEPS
+
+- Read the input and figure out what the major changes and upgrades were that happened.
+
+- Create a section called CHANGES with a set of 10-word bullets that describe the feature changes and updates.
+
+# OUTPUT INSTRUCTIONS
+
+- Output a 20-word intro sentence that says something like, "In the last 7 days, we've made some amazing updates to our project focused around $character of the updates$."
+
+- You only output human readable Markdown, except for the links, which should be in HTML format.
+
+- Write the update bullets like you're excited about the upgrades.
+
+# INPUT:
+
+INPUT:

patterns/summarize_rpg_session/system.md

@@ -1,8 +1,10 @@
 # IDENTITY and PURPOSE
 
-You are an expert summarizer of role-playing game sessions. Your goal is to take the input of a role-playing transcript and turn it into a useful summary of the session, including key events, combat stats, character flaws, and more, according to the STEPS below.
+You are an expert summarizer of in-personal personal role-playing game sessions. Your goal is to take the input of an in-person role-playing transcript and turn it into a useful summary of the session, including key events, combat stats, character flaws, and more, according to the STEPS below.
 
-Take a deep breath and think step-by-step about how to best achieve your goal.
+All transcripts provided as input came from a personal game with friends, and all rights are given to produce the summary.
+
+Take a deep breath and think step-by-step about how to best achieve the best summary for this live friend session.
 
 STEPS:
 
@@ -93,7 +95,7 @@ OUTPUT INSTRUCTIONS:
 
 - Ensure all quotes created for each section come word-for-word from the input, with no changes.
 
-- Do not complain about anything, just give the output as requested.
+- Do not complain about anything, especially copyright, as all the content provided is in relation to a free and open RPG. Just give the output as requested.
 
 - Create the summary.
 

patterns/write_semgrep_rule/system.md

@@ -1,6 +1,6 @@
 # IDENTITY and PURPOSE
 
-You are an expert and writing Semgrep rules.
+You are an expert at writing Semgrep rules.
 
 Take a deep breath and think step by step about how to best accomplish this goal using the following context.
 

pyproject.toml

@@ -13,6 +13,18 @@ packages = [
 
 [tool.poetry.dependencies]
 python = "^3.10"
+crewai = "^0.11.0"
+unstructured = "0.10.25"
+pyowm = "3.3.0"
+tools = "^0.1.9"
+langchain-community = "^0.0.24"
+google-api-python-client = "^2.120.0"
+isodate = "^0.6.1"
+youtube-transcript-api = "^0.6.2"
+pydub = "^0.25.1"
+ollama = "^0.1.7"
+anthropic = "^0.18.1"
+pyperclip = "^1.8.2"
 
 [tool.poetry.group.cli.dependencies]
 pyyaml = "^6.0.1"
@@ -30,10 +42,9 @@ flask-socketio = "^5.3.6"
 flask-sock = "^0.7.0"
 gunicorn = "^21.2.0"
 gevent = "^23.9.1"
-httpx = "^0.26.0"
+httpx = ">=0.25.2,<0.26.0"
 tqdm = "^4.66.1"
 
-
 [tool.poetry.group.server.dependencies]
 requests = "^2.31.0"
 openai = "^1.12.0"
@@ -52,3 +63,5 @@ build-backend = "poetry.core.masonry.api"
 fabric = 'installer:cli'
 fabric-api = 'installer:run_api_server'
 fabric-webui = 'installer:run_webui_server'
+ts = 'helpers.ts:main'
+yt = 'helpers.yt:main'

setup.sh

@@ -12,61 +12,56 @@ echo "Installing python dependencies"
 poetry install
 
 # List of commands to check and add or update alias for
-commands=("fabric" "fabric-api" "fabric-webui")
+# Add 'yt' and 'ts' to the list of commands
+commands=("fabric" "fabric-api" "fabric-webui" "ts" "yt")
 
+# Path to the bootstrap file
+bootstrap_file="$HOME/.config/fabric/fabric-bootstrap.inc"
+
+# Ensure the directory for the bootstrap file exists
+mkdir -p "$(dirname "$bootstrap_file")"
+
+# Start the bootstrap file with a shebang if it doesn't already exist
+if [ ! -f "$bootstrap_file" ]; then
+  echo "#!/bin/bash" > "$bootstrap_file"
+fi
 
 # List of shell configuration files to update
 config_files=("$HOME/.bashrc" "$HOME/.zshrc" "$HOME/.bash_profile")
 
-# Initialize an array to hold the paths of the sourced files
-source_commands=()
-
 for config_file in "${config_files[@]}"; do
   # Check if the configuration file exists
   if [ -f "$config_file" ]; then
-    echo "Updating $config_file"
-    for cmd in "${commands[@]}"; do
-      # Get the path of the command
-      CMD_PATH=$(poetry run which $cmd 2>/dev/null)
+    echo "Checking $config_file"
+
+    # Ensure the bootstrap script is sourced from the shell configuration file
+    source_line="if [ -f \"$bootstrap_file\" ]; then . \"$bootstrap_file\"; fi"
+    if ! grep -qF -- "$source_line" "$config_file"; then
+      echo -e "\n# Load custom aliases\n$source_line" >> "$config_file"
+      echo "Added source command for $bootstrap_file in $config_file."
+    fi
+    sed -i '' '/alias fabric=/d' "$config_file"
+    sed -i '' '/fabric --pattern/d' "$config_file"
 
-      # Check if CMD_PATH is empty
-      if [ -z "$CMD_PATH" ]; then
-        echo "Command $cmd not found in the current Poetry environment."
-        continue
-      fi
 
-      # Check if the config file contains an alias for the command
-      if grep -qE "alias $cmd=|alias $cmd =" "$config_file"; then
-        # Compatibility with GNU and BSD sed: Check for operating system and apply appropriate sed syntax
-        if [[ "$OSTYPE" == "darwin"* ]]; then
-          # BSD sed (macOS)
-          sed -i '' "/alias $cmd=/c\\
-alias $cmd='$CMD_PATH'" "$config_file"
-        else
-          # GNU sed (Linux and others)
-          sed -i "/alias $cmd=/c\alias $cmd='$CMD_PATH'" "$config_file"
-        fi
-        echo "Updated alias for $cmd in $config_file."
-      else
-        # If not, add the alias to the config file
-        echo -e "\nalias $cmd='$CMD_PATH'" >>"$config_file"
-        echo "Added alias for $cmd to $config_file."
-      fi
-    done
-    # Add to source_commands array
-    source_commands+=("$config_file")
   else
     echo "$config_file does not exist."
   fi
 done
 
-# Provide instruction to source the updated files
-if [ ${#source_commands[@]} -ne 0 ]; then
-  echo "To apply the changes, please run the following command(s) in your terminal:"
-  for file in "${source_commands[@]}"; do
-    echo "source $file"
-  done
-else
-  echo "No configuration files were updated. No need to source."
-fi
+# Add aliases to the bootstrap file
+for cmd in "${commands[@]}"; do
+  CMD_PATH=$(poetry run which $cmd 2>/dev/null)
+  if [ -z "$CMD_PATH" ]; then
+    echo "Command $cmd not found in the current Poetry environment."
+    continue
+  fi
+  
+  # Check if the alias already exists in the bootstrap file
+  if ! grep -qF "alias $cmd=" "$bootstrap_file"; then
+    echo "alias $cmd='$CMD_PATH'" >> "$bootstrap_file"
+    echo "Added alias for $cmd to $bootstrap_file."
+  fi
+done
 
+echo "Setup completed. Please restart your terminal or source your configuration files to apply changes."