merging upstream main and solving conflict

README.md

@@ -23,6 +23,9 @@
 
 </div>
 
+> [!NOTE]  
+> We are currently working on some client installation optimizations. If the instructions don't work, check back in a day or two and it should be sorted, and be even easier than before.
+
 ## Navigation
 
 - [What and Why](#what-and-why)
@@ -49,9 +52,9 @@
 # A quick demonstration of writing an essay with Fabric
 ```
 
-
-
-https://github.com/danielmiessler/fabric/assets/50654/09c11764-e6ba-4709-952d-450d70d76ac9
+<video src="https://github.com/danielmiessler/fabric/assets/50654/09c11764-e6ba-4709-952d-450d70d76ac9" controls>
+  Your browser does not support the video tag.
+</video>
 
 ## What and why
 
@@ -154,11 +157,19 @@ poetry install
 5. Run the `setup-aliases.sh` to add the commands as aliases in your OS. It should update both `~/.bashrc` and `/.zshrc` if they are present in your file system.
 
 ```bash
+<<<<<<< HEAD
 ./setup-aliases.sh
+=======
+# Tell your shell how to find the `fabric` client
+echo 'alias fabric="python3 /the/path/to/fabric/client/fabric/fabric.py"' >> ~/.bashrc
+# Example of ~/.zshrc or ~/.bashrc
+alias fabric="python3 ~/Development/fabric/client/fabric/fabric.py"
+>>>>>>> main
 ```
 
 6. Restart your shell
 
+<<<<<<< HEAD
 6. Setup your `OPENAI_API_KEY`.
 
 ```bash
@@ -172,6 +183,16 @@ export OPENAI_API_KEY=foobar
 fabric --help
 fabric-api
 fabric-webui
+=======
+Restart your shell via 'bash'.
+Enter the poetry shell for access to the installed dependencies.
+
+```bash
+# Make sure you can access the help description via the shell
+poetry shell
+# Example
+fabric -h
+>>>>>>> main
 ```
 
 PS: If you're using the `server` functions, `fabric-api` and `fabric-webui` need to be run in dictinct terminal windows.

fabric/client/cli/utils.py

@@ -189,7 +189,7 @@ class Standalone:
         system = platform.system()
         if system == 'Windows':
             if not sys.stdin.isatty():  # Check if input is being piped
-                return sys.stdin.readline().strip()  # Read piped input
+                return sys.stdin.read().strip()  # Read piped input
             else:
                 return input("Enter Question: ")  # Prompt user for input from console
         else:

fabric/client/gui/static/js/index.js

@@ -117,7 +117,6 @@ document.addEventListener("DOMContentLoaded", async function () {
       console.error("Failed to load patterns:", error);
     }
   }
-  loadPatterns();
 
   function fallbackCopyTextToClipboard(text) {
     const textArea = document.createElement("textarea");

patterns/agility_story/system.md

@@ -0,0 +1,21 @@
+# IDENTITY and PURPOSE
+
+You are an expert in the Agile framework. You deeply understand user story and acceptance criteria creation. You will be given a topic. Please write the appropriate information for what is requested. 
+
+# STEPS
+
+Please write a user story and acceptance criteria for the requested topic.
+
+# OUTPUT INSTRUCTIONS
+
+Output the results in JSON format as defined in this example:
+
+{
+    "Topic": "Automating data quality automation",
+    "Story": "As a user, I want to be able to create a new user account so that I can access the system.",
+    "Criteria": "Given that I am a user, when I click the 'Create Account' button, then I should be prompted to enter my email address, password, and confirm password. When I click the 'Submit' button, then I should be redirected to the login page."
+}
+
+# INPUT:
+
+INPUT:

patterns/compare_and_contrast/system.md

@@ -0,0 +1,15 @@
+# IDENTITY and PURPOSE
+
+Please be brief. Compare and contrast the list of items.
+
+# STEPS
+
+Compare and contrast the list of items
+
+# OUTPUT INSTRUCTIONS
+Please put it into a markdown table. 
+Items along the left and topics along the top.
+
+# INPUT:
+
+INPUT:

patterns/extract_wisdom/system.md

@@ -6,13 +6,13 @@ Take a step back and think step-by-step about how to achieve the best possible r
 
 # STEPS
 
-1. Etract a summary of the content in 50 words or less, including who is presenting and the content being discussed into a section called SUMMARY.
+1. Extract a summary of the content in 50 words or less, including who is presenting and the content being discussed into a section called SUMMARY.
 
 2. 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.
 
 3. Extract 15 to 30 of the most surprising, insightful, and/or interesting quotes from the input into a section called QUOTES:. Use the exact quote text from the input.
 
-4. Extract 15 to 30 of the most practical and useful personal habits of the speakers, or mentioned by the speakers, in the connt into a section called HABITS. Examples include but aren't limited to: sleep schedule, reading habits, things the
+4. Extract 15 to 30 of the most practical and useful personal habits of the speakers, or mentioned by the speakers, in the content into a section called HABITS. Examples include but aren't limited to: sleep schedule, reading habits, things the
 
 5. Extract 15 to 30 of the most surprising, insightful, and/or interesting valid facts about the greater world that were mentioned in the content into a section called FACTS:.
 

patterns/summarize/system.md

@@ -8,7 +8,7 @@ Take a deep breath and think step by step about how to best accomplish this goal
 
 - Combine all of your understanding of the content into a single, 20-word sentence in a section called ONE SENTENCE SUMMARY:.
 
-- Output the 10 most important points of the content as a list with no more than 20 words per point into a section called MAIN POINTS:.
+- Output the 10 most important points of the content as a list with no more than 15 words per point into a section called MAIN POINTS:.
 
 - Output a list of the 5 best takeaways from the content in a section called TAKEAWAYS:.