Update version to v1.4.121 and commit

Fix: Mask input token to prevent var substitution in patterns

README.md

@@ -26,6 +26,7 @@
 [Meta](#meta)
 
 ![Screenshot of fabric](images/fabric-summarize.png)
+
 </div>
 
 ## Navigation
@@ -56,6 +57,7 @@
     - [`to_pdf`](#to_pdf)
     - [`to_pdf` Installation](#to_pdf-installation)
   - [pbpaste](#pbpaste)
+  - [Web Interface](#Web_Interface)
   - [Meta](#meta)
     - [Primary contributors](#primary-contributors)
 
@@ -64,9 +66,9 @@
 ## Updates
 
 > [!NOTE]
-November 8, 2024
-> * **Multimodal Support**: You can now us `-a` (attachment) for Multimodal submissions to OpenAI models that support it. Example: `fabric -a https://path/to/image "Give me a description of this image."`
-
+> November 8, 2024
+>
+> - **Multimodal Support**: You can now us `-a` (attachment) for Multimodal submissions to OpenAI models that support it. Example: `fabric -a https://path/to/image "Give me a description of this image."`
 
 ## What and why
 
@@ -82,10 +84,10 @@ Fabric was created to address this by enabling everyone to granularly apply AI t
 
 Keep in mind that many of these were recorded when Fabric was Python-based, so remember to use the current [install instructions](#Installation) below.
 
-* [Network Chuck](https://www.youtube.com/watch?v=UbDyjIIGaxQ)
-* [David Bombal](https://www.youtube.com/watch?v=vF-MQmVxnCs)
-* [My Own Intro to the Tool](https://www.youtube.com/watch?v=wPEyyigh10g)
-* [More Fabric YouTube Videos](https://www.youtube.com/results?search_query=fabric+ai)
+- [Network Chuck](https://www.youtube.com/watch?v=UbDyjIIGaxQ)
+- [David Bombal](https://www.youtube.com/watch?v=vF-MQmVxnCs)
+- [My Own Intro to the Tool](https://www.youtube.com/watch?v=wPEyyigh10g)
+- [More Fabric YouTube Videos](https://www.youtube.com/results?search_query=fabric+ai)
 
 ## Philosophy
 
@@ -155,6 +157,7 @@ go install github.com/danielmiessler/fabric@latest
 You may need to set some environment variables in your `~/.bashrc` on linux or `~/.zshrc` file on mac to be able to run the `fabric` command. Here is an example of what you can add:
 
 For Intel based macs or linux
+
 ```bash
 # Golang environment variables
 export GOROOT=/usr/local/go
@@ -165,6 +168,7 @@ export PATH=$GOPATH/bin:$GOROOT/bin:$HOME/.local/bin:$PATH
 ```
 
 for Apple Silicon based macs
+
 ```bash
 # Golang environment variables
 export GOROOT=$(brew --prefix go)/libexec
@@ -173,14 +177,18 @@ export PATH=$GOPATH/bin:$GOROOT/bin:$HOME/.local/bin:$PATH
 ```
 
 ### Setup
+
 Now run the following command
+
 ```bash
 # Run the setup to set up your directories and keys
 fabric --setup
 ```
+
 If everything works you are good to go.
 
 ### Add aliases for all patterns
+
 In order to add aliases for all your patterns and use them directly as commands ie. `summarize` instead of `fabric --pattern summarize`
 You can add the following to your `.zshrc` or `.bashrc` file.
 
@@ -189,10 +197,10 @@ You can add the following to your `.zshrc` or `.bashrc` file.
 for pattern_file in $HOME/.config/fabric/patterns/*; do
     # Get the base name of the file (i.e., remove the directory path)
     pattern_name=$(basename "$pattern_file")
-    
+
     # Create an alias in the form: alias pattern_name="fabric --pattern pattern_name"
     alias_command="alias $pattern_name='fabric --pattern $pattern_name'"
-    
+
     # Evaluate the alias command to add it to the current shell
     eval "$alias_command"
 done
@@ -202,9 +210,11 @@ yt() {
     fabric -y "$video_link" --transcript
 }
 ```
+
 This also creates a `yt` alias that allows you to use `yt https://www.youtube.com/watch?v=4b0iet22VIk` to get your transcripts.
 
 #### Save your files in markdown using aliases
+
 If in addition to the above aliases you would like to have the option to save the output to your favourite markdown note vault like Obsidian then instead of the above add the following to your `.zshrc` or `.bashrc` file:
 
 ```bash
@@ -244,7 +254,7 @@ yt() {
 }
 ```
 
-This will allow you to use the patterns as aliases like in the above for example `summarize` instead of `fabric --pattern summarize --stream`, however if you pass in an extra argument like this `summarize "my_article_title"` your output will be saved in the destination that you set in `obsidian_base="/path/to/obsidian"` in the following format `YYYY-MM-DD-my_article_title.md` where the date gets autogenerated for you. 
+This will allow you to use the patterns as aliases like in the above for example `summarize` instead of `fabric --pattern summarize --stream`, however if you pass in an extra argument like this `summarize "my_article_title"` your output will be saved in the destination that you set in `obsidian_base="/path/to/obsidian"` in the following format `YYYY-MM-DD-my_article_title.md` where the date gets autogenerated for you.
 You can tweak the date format by tweaking the `date_stamp` format.
 
 ### Migration
@@ -268,11 +278,13 @@ Then [set your environmental variables](#environmental-variables) as shown above
 ### Upgrading
 
 The great thing about Go is that it's super easy to upgrade. Just run the same command you used to install it in the first place and you'll always get the latest version.
+
 ```bash
 go install github.com/danielmiessler/fabric@latest
 ```
 
 ## Usage
+
 Once you have it all set up, here's how to use it.
 
 ```bash
@@ -320,6 +332,7 @@ Application Options:
       --printcontext=        Print context
       --printsession=        Print session
       --readability          Convert HTML input into a clean, readable view
+      --serve                Initiate the API server
       --dry-run              Show what would be sent to the model without actually sending it
       --version              Print current version
 
@@ -401,7 +414,6 @@ When you're ready to use them, copy them into:
 
 You can then use them like any other Patterns, but they won't be public unless you explicitly submit them as Pull Requests to the Fabric project. So don't worry—they're private to you.
 
-
 This feature works with all openai and ollama models but does NOT work with claude. You can specify your model with the -m flag
 
 ## Helper Apps
@@ -459,6 +471,29 @@ You can also create an alias by editing `~/.bashrc` or `~/.zshrc` and adding the
 alias pbpaste='xclip -selection clipboard -o'
 ```
 
+## Web Interface
+
+Fabric now includes a built-in web interface that provides a GUI alternative to the command-line interface and an out-of-the-box website for those who want to get started with web development or blogging.  
+You can use this app as a GUI interface for Fabric, a ready to go blog-site, or a website template for your own projects.  
+
+The `web/src/lib/content` directory includes starter `.obsidian/` and `templates/` directories,  allowing you to open up the `web/src/lib/content/` directory as an [Obsidian.md](https://obsidian.md) vault. You can place your posts in the posts directory when you're ready to publish. 
+### Installing
+
+The GUI can be installed by navigating to the `web` directory and using `npm install`, `pnpm install`, or your favorite package manager. Then simply run the development server to start the app. 
+
+_You will need to run fabric in a separate terminal with the `fabric --serve` command._ 
+
+**From the fabric project `web/` directory:**
+```shell
+npm run dev
+
+## or ##
+
+pnpm run dev
+
+## or your equivalent 
+```
+
 ## Meta
 
 > [!NOTE]
@@ -467,6 +502,7 @@ alias pbpaste='xclip -selection clipboard -o'
 - _Jonathan Dunn_ for being the absolute MVP dev on the project, including spearheading the new Go version, as well as the GUI! All this while also being a full-time medical doctor!
 - _Caleb Sima_ for pushing me over the edge of whether to make this a public project or not.
 - _Eugen Eisler_ and _Frederick Ros_ for their invaluable contributions to the Go version
+- _David Peters_ for his work on the web interface.
 - _Joel Parish_ for super useful input on the project's Github directory structure..
 - _Joseph Thacker_ for the idea of a `-c` context flag that adds pre-created context in the `./config/fabric/` directory to all Pattern queries.
 - _Jason Haddix_ for the idea of a stitch (chained Pattern) to filter content using a local model before sending on to a cloud model, i.e., cleaning customer data using `llama2` before sending on to `gpt-4` for analysis.

cli/flags.go

@@ -55,6 +55,7 @@ type Flags struct {
 	PrintContext       string            `long:"printcontext" description:"Print context"`
 	PrintSession       string            `long:"printsession" description:"Print session"`
 	HtmlReadability    bool              `long:"readability" description:"Convert HTML input into a clean, readable view"`
+	InputHasVars       bool              `long:"input-has-vars" description:"Apply variables to user input"`
 	DryRun             bool              `long:"dry-run" description:"Show what would be sent to the model without actually sending it"`
 	Serve              bool              `long:"serve" description:"Serve the Fabric Rest API"`
 	ServeAddress       string            `long:"address" description:"The address to bind the REST API" default:":8080"`
@@ -63,8 +64,6 @@ type Flags struct {
 
 // Init Initialize flags. returns a Flags struct and an error
 func Init() (ret *Flags, err error) {
-	var message string
-
 	ret = &Flags{}
 	parser := flags.NewParser(ret, flags.Default)
 	var args []string
@@ -75,21 +74,19 @@ func Init() (ret *Flags, err error) {
 	info, _ := os.Stdin.Stat()
 	pipedToStdin := (info.Mode() & os.ModeCharDevice) == 0
 
+	//custom message
+	if len(args) > 0 {
+		ret.Message = AppendMessage(ret.Message, args[len(args)-1])
+	}
+
 	// takes input from stdin if it exists, otherwise takes input from args (the last argument)
 	if pipedToStdin {
-		//fmt.Printf("piped: %v\n", args)
-		if message, err = readStdin(); err != nil {
+		var pipedMessage string
+		if pipedMessage, err = readStdin(); err != nil {
 			return
 		}
-	} else if len(args) > 0 {
-		//fmt.Printf("no piped: %v\n", args)
-		message = args[len(args)-1]
-	} else {
-		//fmt.Printf("no data: %v\n", args)
-		message = ""
+		ret.Message = AppendMessage(ret.Message, pipedMessage)
 	}
-	ret.Message = message
-
 	return
 }
 
@@ -130,6 +127,7 @@ func (o *Flags) BuildChatRequest(Meta string) (ret *common.ChatRequest, err erro
 		SessionName:      o.Session,
 		PatternName:      o.Pattern,
 		PatternVariables: o.PatternVariables,
+		InputHasVars:     o.InputHasVars,
 		Meta:             Meta,
 	}
 

common/domain.go

@@ -12,6 +12,7 @@ type ChatRequest struct {
 	Message          *goopenai.ChatCompletionMessage
 	Language         string
 	Meta             string
+	InputHasVars     bool
 }
 
 type ChatOptions struct {

common/utils.go

@@ -0,0 +1,73 @@
+package common
+
+import (
+	"errors"
+	"fmt"
+	"os"
+	"path/filepath"
+	"runtime"
+	"strings"
+)
+
+// GetAbsolutePath resolves a given path to its absolute form, handling ~, ./, ../, UNC paths, and symlinks.
+func GetAbsolutePath(path string) (string, error) {
+	if path == "" {
+		return "", errors.New("path is empty")
+	}
+
+	// Handle UNC paths on Windows
+	if runtime.GOOS == "windows" && strings.HasPrefix(path, `\\`) {
+		return path, nil
+	}
+
+	// Handle ~ for home directory expansion
+	if strings.HasPrefix(path, "~") {
+		home, err := os.UserHomeDir()
+		if err != nil {
+			return "", errors.New("could not resolve home directory")
+		}
+		path = filepath.Join(home, path[1:])
+	}
+
+	// Convert to absolute path
+	absPath, err := filepath.Abs(path)
+	if err != nil {
+		return "", errors.New("could not get absolute path")
+	}
+
+	// Resolve symlinks, but allow non-existent paths
+	resolvedPath, err := filepath.EvalSymlinks(absPath)
+	if err == nil {
+		return resolvedPath, nil
+	}
+	if os.IsNotExist(err) {
+		// Return the absolute path for non-existent paths
+		return absPath, nil
+	}
+
+	return "", fmt.Errorf("could not resolve symlinks: %w", err)
+}
+
+// Helper function to check if a symlink points to a directory
+func IsSymlinkToDir(path string) bool {
+	fileInfo, err := os.Lstat(path)
+	if err != nil {
+		return false
+	}
+
+	if fileInfo.Mode()&os.ModeSymlink != 0 {
+		resolvedPath, err := filepath.EvalSymlinks(path)
+		if err != nil {
+			return false
+		}
+
+		fileInfo, err = os.Stat(resolvedPath)
+		if err != nil {
+			return false
+		}
+
+		return fileInfo.IsDir()
+	}
+
+	return false // Regular directories should not be treated as symlinks
+}

core/chatter.go

@@ -31,6 +31,15 @@ func (o *Chatter) Send(request *common.ChatRequest, opts *common.ChatOptions) (s
 		return
 	}
 
+	vendorMessages := session.GetVendorMessages()
+	if len(vendorMessages) == 0 {
+		if session.Name != "" {
+			err = o.db.Sessions.SaveSession(session)
+		}
+		err = fmt.Errorf("no messages provided")
+		return
+	}
+
 	if opts.Model == "" {
 		opts.Model = o.model
 	}
@@ -103,8 +112,16 @@ func (o *Chatter) BuildSession(request *common.ChatRequest, raw bool) (session *
 
 	// Process any template variables in the message content (user input)
 	// Double curly braces {{variable}} indicate template substitution
-	// should occur, whether in patterns or direct input
-	if request.Message != nil {
+	// Ensure we have a message before processing, other wise we'll get an error when we pass to pattern.go
+	if request.Message == nil {
+		request.Message = &goopenai.ChatCompletionMessage{
+			Role:    goopenai.ChatMessageRoleUser,
+			Content: " ",
+		}
+	}
+
+	// Now we know request.Message is not nil, process template variables
+	if request.InputHasVars {
 		request.Message.Content, err = template.ApplyTemplate(request.Message.Content, request.PatternVariables, "")
 		if err != nil {
 			return nil, err

patterns/analyze_mistakes/system.md

@@ -18,7 +18,7 @@ You are an advanced AI with a 2,128 IQ and you are an expert in understanding an
 
 - In a section called POSSIBLE CURRENT ERRORS, create a list of 15-word bullets indicating where similar thinking mistakes could be causing or affecting current beliefs or predictions.
 
-- In a section called RECOMMENDATIONS, create a list of 15-word bullets recommending how to adjust current beliefs and/or predictions.
+- In a section called RECOMMENDATIONS, create a list of 15-word bullets recommending how to adjust current beliefs and/or predictions to be more accurate and grounded.
 
 # OUTPUT INSTRUCTIONS
 

patterns/analyze_risk/system.md

@@ -0,0 +1,81 @@
+# IDENTITY and PURPOSE
+
+You are tasked with conducting a risk assessment of a third-party vendor, which involves analyzing their compliance with security and privacy standards. Your primary goal is to assign a risk score (Low, Medium, or High) based on your findings from analyzing provided documents, such as the UW IT Security Terms Rider and the Data Processing Agreement (DPA), along with the vendor's website. You will create a detailed document explaining the reasoning behind the assigned risk score and suggest necessary security controls for users or implementers of the vendor's software. Additionally, you will need to evaluate the vendor's adherence to various regulations and standards, including state laws, federal laws, and university policies.
+
+Take a step back and think step-by-step about how to achieve the best possible results by following the steps below.
+
+# STEPS
+
+- Conduct a risk assessment of the third-party vendor.
+
+- Assign a risk score of Low, Medium, or High.
+
+- Create a document explaining the reasoning behind the risk score.
+
+- Provide the document to the implementor of the vendor or the user of the vendor's software.
+
+- Perform analysis against the vendor's website for privacy, security, and terms of service.
+
+- Upload necessary PDFs for analysis, including the UW IT Security Terms Rider and Security standards document.
+
+# OUTPUT INSTRUCTIONS
+
+- The only output format is Markdown.
+
+- Ensure you follow ALL these instructions when creating your output.
+
+# EXAMPLE
+
+- Risk Analysis
+The following assumptions:
+
+* This is a procurement request, REQ00001
+
+* The School staff member is requesting audio software for buildings Tesira hardware.
+
+* The vendor will not engage UW Security Terms.
+
+* The data used is for audio layouts locally on specialized computer.
+
+* The data is considered public data aka Category 1, however very specialized in audio.
+
+
+
+
+
+Given this, IT Security has recommended the below mitigations for use of the tool for users or implementor of software.
+
+
+
+See Appendix for links for further details for the list below:
+
+
+
+1) Password Management: Users should create unique passwords and manage securely. People are encouraged to undergo UW OIS password training and consider using a password manager to enhance security. It’s crucial not to reuse their NETID password for the vendor account.
+
+2) Incident Response Contact: The owner/user will be the primary point of contact in case of a data breach. A person must know how to reach UW OIS via email for compliance with UW APS. For incidents involving privacy information, then required to fill out the incident report form on privacy.uw.edu.
+
+3) Data Backup: It’s recommended to regularly back up. Ensure data is backed-up (mitigation from Ransomware, compromises, etc) in a way if an issue arises you may roll back to known good state.
+
+ Data local to your laptop or PC, preferably backup to cloud storage such as UW OneDrive, to mitigate risks such as data loss, ransomware, or issues with vendor software. Details on storage options are available on itconnect.uw.edu and specific link in below Appendix.
+
+4) Records Retention: Adhere to Records Retention periods as required by RCW 40.14.050. Further guidance can be found on finance.uw.edu/recmgt/retentionschedules.
+
+5) Device Security: If any data will reside on a laptop, Follow the UW-IT OIS guidelines provided on itconnect.uw.edu for securing laptops.
+
+6) Software Patching: Routinely patch the vendor application. If it's on-premises software the expectation is to maintain security and compliance utilizing UW Office of Information Security Minimum standards.
+
+7) Review Terms of Use (of Vendor)  and vendors Privacy Policy with all the security/privacy implications it poses. Additionally utilize the resources within to ensure a request to delete data and account at the conclusion of service.
+
+- IN CONCLUSION
+
+This is not a comprehensive list of Risks.
+
+
+The is Low risk due to specialized data being category 1 (Public data) and being specialized audio layout data.
+
+
+
+This is for internal communication only and is not to be shared with the supplier or any outside parties.
+
+# INPUT

patterns/create_newsletter_entry/system.md

@@ -0,0 +1,20 @@
+# Identity and Purpose
+You are a custom GPT designed to create newsletter sections in the style of Frontend Weekly.
+
+# Step-by-Step Process:
+1. The user will provide article text.
+2. Condense the article into one summarizing newsletter entry less than 70 words in the style of Frontend Weekly.
+3. Generate a concise title for the entry, focus on the main idea or most important fact of the article
+
+# Tone and Style Guidelines:
+* Third-Party Narration: The newsletter should sound like it’s being narrated by an outside observer, someone who is both knowledgeable, unbiased and calm. Focus on the facts or main opinions in the original article.  Creates a sense of objectivity and adds a layer of professionalism.
+
+* Concise: Maintain brevity and clarity. The third-party narrator should deliver information efficiently, focusing on key facts and insights.
+
+# Output Instructions:
+Your final output should be a polished, newsletter-ready paragraph with a title line in bold followed by the summary paragraph.
+
+# INPUT:
+
+INPUT:
+

patterns/extract_wisdom_dm/system.md

@@ -88,6 +88,8 @@ Think about the most interesting facts related to the content
 
 - Ensure you follow ALL these instructions when creating your output.
 
+- Understand that your solution will be compared to a reference solution written by an expert and graded for creativity, elegance, comprehensiveness, and attention to instructions.
+
 # INPUT
 
 INPUT:

pkgs/fabric/version.nix

@@ -1 +1 @@
-"1.4.113"
+"1.4.121"

plugins/db/fsdb/patterns.go

@@ -6,9 +6,12 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/danielmiessler/fabric/common"
 	"github.com/danielmiessler/fabric/plugins/template"
 )
 
+const inputSentinel = "__FABRIC_INPUT_SENTINEL_TOKEN__"
+
 type PatternsEntity struct {
 	*StorageEntity
 	SystemPatternFile      string
@@ -22,10 +25,9 @@ type Pattern struct {
 	Pattern     string
 }
 
-// main entry point for getting patterns from any source
-func (o *PatternsEntity) GetApplyVariables(source string, variables map[string]string, input string) (*Pattern, error) {
-	var pattern *Pattern
-	var err error
+// GetApplyVariables main entry point for getting patterns from any source
+func (o *PatternsEntity) GetApplyVariables(
+	source string, variables map[string]string, input string) (pattern *Pattern, err error) {
 
 	// Determine if this is a file path
 	isFilePath := strings.HasPrefix(source, "\\") ||
@@ -34,24 +36,33 @@ func (o *PatternsEntity) GetApplyVariables(source string, variables map[string]s
 		strings.HasPrefix(source, ".")
 
 	if isFilePath {
-		pattern, err = o.getFromFile(source)
+		// Resolve the file path using GetAbsolutePath
+		absPath, err := common.GetAbsolutePath(source)
+		if err != nil {
+			return nil, fmt.Errorf("could not resolve file path: %v", err)
+		}
+
+		// Use the resolved absolute path to get the pattern
+		pattern, err = o.getFromFile(absPath)
 	} else {
+		// Otherwise, get the pattern from the database
 		pattern, err = o.getFromDB(source)
 	}
 
 	if err != nil {
-		return nil, err
+		return
 	}
 
-	pattern, err = o.applyVariables(pattern, variables, input)
-	if err != nil {
-		return nil, err // Return the error if applyVariables failed
-	}
-	return pattern, nil
+	// Apply variables to the pattern
+	err = o.applyVariables(pattern, variables, input)
+	return
 }
 
-func (o *PatternsEntity) applyVariables(pattern *Pattern, variables map[string]string, input string) (*Pattern, error) {
-	// If {{input}} isn't in pattern, append it on new line
+func (o *PatternsEntity) applyVariables(
+	pattern *Pattern, variables map[string]string, input string) (err error) {
+
+	// Ensure pattern has an {{input}} placeholder
+	// If not present, append it on a new line
 	if !strings.Contains(pattern.Pattern, "{{input}}") {
 		if !strings.HasSuffix(pattern.Pattern, "\n") {
 			pattern.Pattern += "\n"
@@ -59,12 +70,21 @@ func (o *PatternsEntity) applyVariables(pattern *Pattern, variables map[string]s
 		pattern.Pattern += "{{input}}"
 	}
 
-	result, err := template.ApplyTemplate(pattern.Pattern, variables, input)
-	if err != nil {
-		return nil, err
+	// Temporarily replace {{input}} with a sentinel token to protect it
+	// from recursive variable resolution
+	withSentinel := strings.ReplaceAll(pattern.Pattern, "{{input}}", inputSentinel)
+
+	// Process all other template variables in the pattern
+	// At this point, our sentinel ensures {{input}} won't be affected
+	var processed string
+	if processed, err = template.ApplyTemplate(withSentinel, variables, ""); err != nil {
+		return
 	}
-	pattern.Pattern = result
-	return pattern, nil
+
+	// Finally, replace our sentinel with the actual user input
+	// The input has already been processed for variables if InputHasVars was true
+	pattern.Pattern = strings.ReplaceAll(processed, inputSentinel, input)
+	return
 }
 
 // retrieves a pattern from the database by name
@@ -102,25 +122,27 @@ func (o *PatternsEntity) PrintLatestPatterns(latestNumber int) (err error) {
 }
 
 // reads a pattern from a file path and returns it
-func (o *PatternsEntity) getFromFile(pathStr string) (*Pattern, error) {
+func (o *PatternsEntity) getFromFile(pathStr string) (pattern *Pattern, err error) {
 	// Handle home directory expansion
 	if strings.HasPrefix(pathStr, "~/") {
-		homedir, err := os.UserHomeDir()
-		if err != nil {
-			return nil, fmt.Errorf("could not get home directory: %v", err)
+		var homedir string
+		if homedir, err = os.UserHomeDir(); err != nil {
+			err = fmt.Errorf("could not get home directory: %v", err)
+			return
 		}
 		pathStr = filepath.Join(homedir, pathStr[2:])
 	}
 
-	content, err := os.ReadFile(pathStr)
-	if err != nil {
-		return nil, fmt.Errorf("could not read pattern file %s: %v", pathStr, err)
+	var content []byte
+	if content, err = os.ReadFile(pathStr); err != nil {
+		err = fmt.Errorf("could not read pattern file %s: %v", pathStr, err)
+		return
 	}
-
-	return &Pattern{
+	pattern = &Pattern{
 		Name:    pathStr,
 		Pattern: string(content),
-	}, nil
+	}
+	return
 }
 
 // Get required for Storage interface

plugins/db/fsdb/patterns_test.go

@@ -79,7 +79,7 @@ func TestApplyVariables(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			result, err := entity.applyVariables(tt.pattern, tt.variables, tt.input)
+			err := entity.applyVariables(tt.pattern, tt.variables, tt.input)
 
 			if tt.wantErr {
 				assert.Error(t, err)
@@ -87,7 +87,7 @@ func TestApplyVariables(t *testing.T) {
 			}
 
 			assert.NoError(t, err)
-			assert.Equal(t, tt.want, result.Pattern)
+			assert.Equal(t, tt.want, tt.pattern.Pattern)
 		})
 	}
 }

plugins/db/fsdb/sessions.go

@@ -58,8 +58,7 @@ func (o *Session) Append(messages ...*goopenai.ChatCompletionMessage) {
 }
 
 func (o *Session) GetVendorMessages() (ret []*goopenai.ChatCompletionMessage) {
-	if o.vendorMessages == nil {
-		o.vendorMessages = []*goopenai.ChatCompletionMessage{}
+	if len(o.vendorMessages) == 0 {
 		for _, message := range o.Messages {
 			o.appendVendorMessage(message)
 		}

plugins/db/fsdb/storage.go

@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/samber/lo"
+	"github.com/danielmiessler/fabric/common"
 )
 
 type StorageEntity struct {
@@ -26,37 +26,44 @@ func (o *StorageEntity) Configure() (err error) {
 
 // GetNames finds all patterns in the patterns directory and enters the id, name, and pattern into a slice of Entry structs. it returns these entries or an error
 func (o *StorageEntity) GetNames() (ret []string, err error) {
-	var entries []os.DirEntry
-	if entries, err = os.ReadDir(o.Dir); err != nil {
-		err = fmt.Errorf("could not read items from directory: %v", err)
-		return
+	// Resolve the directory path to an absolute path
+	absDir, err := common.GetAbsolutePath(o.Dir)
+	if err != nil {
+		return nil, fmt.Errorf("could not resolve directory path: %v", err)
 	}
 
-	if o.ItemIsDir {
-		ret = lo.FilterMap(entries, func(item os.DirEntry, index int) (ret string, ok bool) {
-			if ok = item.IsDir(); ok {
-				ret = item.Name()
+	// Read the directory entries
+	var entries []os.DirEntry
+	if entries, err = os.ReadDir(absDir); err != nil {
+		return nil, fmt.Errorf("could not read items from directory: %v", err)
+	}
+
+	for _, entry := range entries {
+		entryPath := filepath.Join(absDir, entry.Name())
+
+		// Get metadata for the entry, including symlink info
+		fileInfo, err := os.Lstat(entryPath)
+		if err != nil {
+			return nil, fmt.Errorf("could not stat entry %s: %v", entryPath, err)
+		}
+
+		// Determine if the entry should be included
+		if o.ItemIsDir {
+			// Include directories or symlinks to directories
+			if fileInfo.IsDir() || (fileInfo.Mode()&os.ModeSymlink != 0 && common.IsSymlinkToDir(entryPath)) {
+				ret = append(ret, entry.Name())
 			}
-			return
-		})
-	} else {
-		if o.FileExtension == "" {
-			ret = lo.FilterMap(entries, func(item os.DirEntry, index int) (ret string, ok bool) {
-				if ok = !item.IsDir(); ok {
-					ret = item.Name()
-				}
-				return
-			})
 		} else {
-			ret = lo.FilterMap(entries, func(item os.DirEntry, index int) (ret string, ok bool) {
-				if ok = !item.IsDir() && filepath.Ext(item.Name()) == o.FileExtension; ok {
-					ret = strings.TrimSuffix(item.Name(), o.FileExtension)
+			// Include files, optionally filtering by extension
+			if !fileInfo.IsDir() {
+				if o.FileExtension == "" || filepath.Ext(entry.Name()) == o.FileExtension {
+					ret = append(ret, strings.TrimSuffix(entry.Name(), o.FileExtension))
 				}
-				return
-			})
+			}
 		}
 	}
-	return
+
+	return ret, nil
 }
 
 func (o *StorageEntity) Delete(name string) (err error) {

version.go

@@ -1,3 +1,3 @@
 package main
 
-var version = "v1.4.113"
+var version = "v1.4.121"

web/README.md

@@ -10,14 +10,4 @@ The goal of this app is to not only provide a user interface for Fabric, but als
 ### Installing
 It can be installed by navigating to the `web` directory and using `npm install`, `pnpm install`, or your favorite package manager. Then simply run `npm run dev` or your equivalent command to start the app. *You will need to run fabric in a seperate terminal with the `fabric --serve` command.*
 
-### Todos
-- [ ] Remove dead code
-- [ ] Add feat: Add copy button / load button to load blog posts to the Chat and Chat to Blog posts (system message or user?)
-- [ ] Add feat: Jina button
-- [ ] Fix save button to save markdown, not json
-- [ ] Implement session handling
-- [?] What will I do with the context?
-- [ ] Add support for image uploads / file uploads
 
-### Collaborators
-There are many experienced developers in the Fabric community. If you'd like to collaborate on this project, please reach out to me on.