Update version to v1.4.54 and commit

Corrected spelling and grammatical errors for consistency and clarity for transcribe_minutes

.github/workflows/release.yml

@@ -1,8 +1,9 @@
 name: Go Release
 
 on:
+  repository_dispatch:
+    types: [ tag_created ]
   push:
-    branches: ["main"]
     tags:
       - "v*"
 
@@ -15,6 +16,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Set up Go
         uses: actions/setup-go@v4
@@ -40,6 +43,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Set up Go
         uses: actions/setup-go@v4
@@ -88,23 +93,36 @@ jobs:
           name: fabric-windows-${{ matrix.arch }}.exe
           path: fabric-windows-${{ matrix.arch }}.exe
 
+      - name: Get latest tag
+        if: matrix.os != 'windows-latest'
+        id: get_latest_tag
+        run: |
+          latest_tag=$(git tag --sort=-creatordate | head -n 1)
+          echo "latest_tag=$latest_tag" >> $GITHUB_ENV
+
+      - name: Get latest tag
+        if: matrix.os == 'windows-latest'
+        id: get_latest_tag_windows
+        run: |
+          $latest_tag = git tag --sort=-creatordate | Select-Object -First 1
+          Add-Content -Path $env:GITHUB_ENV -Value "latest_tag=$latest_tag"
+
       - name: Create release if it doesn't exist
-        if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          gh release view ${{ github.ref_name }} || gh release create ${{ github.ref_name }} --title "Release ${{ github.ref_name }}" --notes "Automated release for ${{ github.ref_name }}"
+          gh release view ${{ env.latest_tag }} || gh release create ${{ env.latest_tag }} --title "Release ${{ env.latest_tag }}" --notes "Automated release for ${{ env.latest_tag }}"
 
       - name: Upload release artifact
-        if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
+        if: matrix.os == 'windows-latest'
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          gh release upload ${{ github.ref_name }} fabric-windows-${{ matrix.arch }}.exe
+          gh release upload ${{ env.latest_tag }} fabric-windows-${{ matrix.arch }}.exe
 
       - name: Upload release artifact
-        if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') && matrix.os != 'windows-latest'
+        if: matrix.os != 'windows-latest'
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          gh release upload ${{ github.ref_name }} fabric-${OS}-${{ matrix.arch }}
+          gh release upload ${{ env.latest_tag }} fabric-${OS}-${{ matrix.arch }}

.github/workflows/update-version-and-create-tag.yml

@@ -0,0 +1,81 @@
+name: Update Version File and Create Tag
+
+on:
+  push:
+    branches:
+      - main  # Monitor the main branch
+
+permissions:
+  contents: write  # Ensure the workflow has write permissions
+
+jobs:
+  update-version:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up Git
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+
+      - name: Get the latest tag
+        id: get_latest_tag
+        run: |
+          latest_tag=$(git tag --sort=-creatordate | head -n 1)
+          echo "Latest tag is: $latest_tag"
+          echo "tag=$latest_tag" >> $GITHUB_ENV  # Save the latest tag to environment file
+
+      - name: Increment patch version
+        id: increment_version
+        run: |
+          latest_tag=${{ env.tag }}
+          major=$(echo "$latest_tag" | cut -d. -f1 | sed 's/v//')
+          minor=$(echo "$latest_tag" | cut -d. -f2)
+          patch=$(echo "$latest_tag" | cut -d. -f3)
+          new_patch=$((patch + 1))
+          new_tag="v${major}.${minor}.${new_patch}"
+          echo "New tag is: $new_tag"
+          echo "new_tag=$new_tag" >> $GITHUB_ENV  # Save the new tag to environment file
+
+      - name: Update version.go file
+        run: |
+          echo "package main" > version.go
+          echo "" >> version.go
+          echo "var version = \"${{ env.new_tag }}\"" >> version.go
+
+      - name: Commit changes
+        run: |
+          git add version.go
+          if ! git diff --staged --quiet; then
+            git commit -m "Update version to ${{ env.new_tag }} and commit $commit_hash"
+          else
+            echo "No changes to commit."
+          fi
+
+      - name: Push changes
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Use GITHUB_TOKEN to authenticate the push
+        run: |
+          git push origin main  # Push changes to the main branch
+
+      - name: Create a new tag
+        env:
+          GITHUB_TOKEN: ${{ secrets.TAG_PAT }}
+        run: |
+          git tag ${{ env.new_tag }}
+          git push origin ${{ env.new_tag }}  # Push the new tag
+
+      - name: Dispatch event to trigger release workflow
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Use GITHUB_TOKEN to authenticate the dispatch
+        run: |
+          curl -X POST \
+            -H "Authorization: token $GITHUB_TOKEN" \
+            -H "Accept: application/vnd.github.v3+json" \
+            https://api.github.com/repos/${{ github.repository }}/dispatches \
+            -d '{"event_type": "tag_created", "client_payload": {"tag": "${{ env.new_tag }}"}}'

.gitignore

@@ -11,6 +11,7 @@ __pycache__/
 
 # Distribution / packaging
 .Python
+.idea
 build/
 develop-eggs/
 dist/

Alma.md

@@ -0,0 +1,200 @@
+## Document Purpose
+
+This document captures the SPQA policy and State for Alma Security, a security startup out of Redwood City, Ca.
+
+This is part of the SPQA context that will be used to answer questions and create artifacts for the company, e.g., company strategy, security strategy, quarterly security reports (QSRs), project plans, recommendations on which projects to undertake, which investments to take and avoid, and other such decisions.
+
+A major aspect of the SPQA system is the definition of the company's mission, goals, KPIs, and challenges. These shape everything within the company and thus should be used to shape the recommendations made when asked.
+
+In addition to the clearly stated goals and other defining characteristics listed above, there will also be a streaming list of updates coming into this system using the Activity document.
+
+Those will be changes, updates, or modifications to the direction of the company. For example, if Goal number 4 is to build a new datacenter in Boise, Idaho, but we see an update in the Activity section that says we've lost the ability to build in Boise, we should consider goal #4 out of the picture for prioritization and other decision purposes. In other words, the streaming activity log into this document should be considered updates to the core content.
+
+## Company History
+
+Alma Security was started by Chris Meyers, who was previously at Sigma Systems as CTO and HPE as a senior security engineer.
+
+He started the company becuase, "I saw a gap in the authentication market, where companies were only looking at one or two aspects of one's identity to do authentication. They we're looking at the whole picture and turning that into a continuous authentication story."
+
+## Company Mission
+
+The mission of Alma Security is to ensure businesses can continuously authenticate their users using their whole selves.
+
+## Company Goals (G1 means goal 1, G2 is goal 2, etc. Treat each item (goal/kpi/etc) as half as important as the one before it.)
+
+NOTE: Some goals are things like project rollouts which serve the higher goals. In that case they shouldn't always be considered so much lower priority because one is serving the other.
+
+## Company Goals
+
+- G1: Achieve 20% market share by January 2025
+- G2: Hit 10000 active customers by January 2025
+- G3: Hit a customer trust score of 90+% by January 2025
+- G4: Get churn below 5% by August 2024
+- G5: Launch in Europe by August 2024
+- G6: Launch in India by November 2024
+- G7: Launch Mood-monitor integration by February 2024
+- G8: Launch partnership with Apple Passkeys by June 2024
+
+## Company KPIs
+
+- K1: Current marketshare percentage
+- K2: Number of active customers
+- K3: Current churn percentage
+- K4: Launched_in_Europe (yes/no)
+- K4: Launched_in_India (yes/no)
+
+-----------------------------------------------------------------------------------------------------------------------
+
+## Security Team Mission 
+
+- SM1: Protect Alma Security's customers and intellectual property from security and privacy incidents.
+
+## Security Team Goals
+
+- SG1: Secure all customer data -- especially biometric -- from security and privacy incidents. 
+- SG2: Protect Alma Security's intellectual property from being captured by unathorized parties.
+- SG3: Reach a time to detect malicious behavior of less than 4 minutes by January 2025
+- SG4: Ensure the public trusts our product, because it's an authentication product we can't survive if people don't trust us.
+- SG5: Reach a time to remediate critical vulnerabilties on crown jewel systems of less than 16 hours by August 2025
+- SG6: Reach a time to remediate critical vulnerabilties on all systems of less than 3 days by August 2025
+- SG7: Complete audit of Apple Passkey integration by February 2025
+- SG8: Complete remediation of Apple Passkey vulns by February 2025
+
+## Security Team KPIs (How we measure the team)
+
+- SK1: TTD: Time to detect malicious behavior (Minutes)
+- SK1: TTI: Time to begin investigation of malicious behavior (Minutes)
+- SK3: TTR-CJC: Time to remediate critical vulnerabilities on crown jewel systems (Hours)
+- SK3: TTR-C: Time to remediate critical vulnerabilities on all systems (Hours)
+- SK4: PT: Public trust score (Complete, Significant, Moderate, Minimal, Distrust, N/A)
+
+## Risk Register (The things we're most worried about)
+
+- R1: Our infrastructure security team is understaffed by 50% after 5 key people left 
+- R2: We are not currently monitoring our external perimeter for attack surface related vulnerabilities like open ports, listening applications, unknown hosts, unknown subdomains pointing to these things, etc. We only do scans once every couple of months and we don't really have anyone to look at the results
+- R3: It takes us multiple days to investigate potential malicious behavior on our systems.
+- R4: We lack a full list of our assets, including externally facing hosts, S3 buckets, etc., which make up our attack surface
+- R5: We have a low public trust score due to the events of 2022.
+
+## Security Team Narrative
+
+### Background
+
+Alma hired a new security team starting in January of 2023 and we have been building out the program since then. The philosophy and approach for the security team is to explicitly articulate what we believe the highest risks are to Alma, to deploy targeted strategies to address those risks, and to use clear, transparent KPIs to show progress towards our goals over time.
+
+### Current Risks
+
+So our risk register looks like this:
+
+1. We are understaffed by 50% after 5 key people left in 2022
+2. Our perimeter is not being monitored for attack surface related vulnerabilities
+3. It takes us too long to detect and start investigating malicious behavior on our systems
+4. We do not have a full list of our assets, which makes it difficult to know what we need to protect
+5. We have a low public trust score due to the events of 2022 
+
+### Strategies
+
+As such, our strategies are as follows:
+
+1. Hire 5 more A-tier security professionals
+2. Purchase and implement an attack surface management solution
+3. Invest in our detection and response capabilities
+4. Purchase an asset inventory system that integrates with our attack surface management tool
+5. Leverage PR to share as much of our progress as possible with the public to rebuild trust
+
+### How We're Doing
+
+We believe being transparent about our progress is key to everything, and for that reason we maintain a limited number of KPIs that we update every quarter. These metrics will not change often. They will remain consistent so that it's easy to track how we're spending our resources and the progress we're making.
+
+Those KPIs are:
+
+1. Time to detect malicious behavior
+2. Time to start investigating malicious behavior
+3. Time to remediate critical vulnerabilities on crown jewel systems
+4. Time to remediate critical vulnerabilities on all systems
+5. Our public trust score
+
+As of $DATE$, our KPIs for these are currently:
+
+$GIVE CURRENT KPIs from the Activity section below$
+
+$INSERT GRAPHS OF KPI PROGRESS OVER TIME HERE$
+
+## Security Team Strategies
+
+- STS1: Hire 5 more A-tier security professionals
+- STS2: Purchase an attack surface management solution
+- STS3: Invest in our detection and response capabilities
+- STS4: Purchase an asset inventory system that integrates with our attack surface management tool
+
+## Infrastructure Notes (a basic description of our tech stack and various context around it)
+
+- We currenty have no WAF protecting our main web app but we're considering adding one
+- We have had some issues with S3 buckets becoming public, or being set up as public, which has lead to some close calls with customer data almost being exposed.
+- alma.amazon-domain.com is our primary S3 bucket that contains everything, but it's not public readable or listable
+- We have a root account for our AWS account that doesn't yet have 2FA on it, but we're working on fixing that within a few weeks (but it's been open for a few months)
+- We also use Postgres for all our databases.
+- Developers have root access to the all kubernetes nodes via SSH on port 45,001 using a shared developer key issued during laptop provisioning. 
+- We're a kubernetes shop and do everything through AWS
+- We're logging most stuff to Cloudtrail and we kind of use guarduty, but we don't have a 24/7 team to monitor alerts and logs. We should add that to our list of challenges next time we update our overarll policy
+- We also have a Windows infrastructure because some key personell came from Microsoft. The DC is hosted in our head office which is in Redwood City, and anyone who works in that office (most of the 300 employees) uses that to log in when tehy start work. The domain is ALMA.
+- There's a domain-joined fileserver running Windows 2012 that most people use to upload new ideas and plans for new products. It uses Windows authentication from the domain. 
+- We use a palo alto firewall with 2fa using windows authenticator tied to SSO.
+- The name of the AI system doing all this context creation using SPQA is Alma, which is also the name of the company.
+- We use Workday for HR stuff. Slack for realtime communications. Outlook 365 as a service. Sentinel One on the workstations and laptops. Servers in AWS are mostly Amazon Linux 2 with a few Ubuntu boxes that are a few years old. 
+- We also primarily use Postgres for all of our systems.
+
+## Team
+
+TEAM MEMBER | TEAM ASSIGNED | SKILLS | PAY LEVEL | LOCATION | PROJECTS
+
+Nadia Khan | Detection and Response | D&R (Expert), AWS (Strong), Python (Expert), Kubernetes (Basic), Postgres (Basic) | $249K | Redwood City
+Chris Magann | Vulnerability Management | VM (Expert), AWS (Strong), Python (Basic), Postgres (Basic) | $212K | Redwood City
+Tigan Wang | Vulnerability Management | VM (Expert), AWS (Strong), Python (Basic), Postgres (Basic) | $217K | Redwood City
+
+## Projects
+
+PROJECT NAME | PROJECT DESCRIPTION | PROJECT PRIORITY | PROJECT MEMBERS | START DATE | END DATE | STATUS | PROJECT COST
+
+WAF Install | Install a WAF in front of our main web app | Critical | Nadia Khan | 2024-01-01 - Ongoing | In Progress | $112K one-time, $9K/month
+
+Multi-Factor Authentication (MFA) Rollout | Implement MFA across all internal and external systems | Critical | Chris Magaan | 2024-01-15 | 2024-05-01 | Planned | $80K one-time, $5K/month 
+
+Procure and Implement ASM | Implement continuous monitoring for attack surface vulnerabilities | High | Tigan Wang | 2024-02-15 | 2024-06-15 | Not Started | $75K one-time, $6K/month 
+
+Data Encryption Upgrade | Upgrade encryption protocols for all sensitive data | Medium | Nadia Khan | 2024-04-01 | 2024-08-01 | Planned | $95K one-time 
+
+Incident Response Enhancement | Develop and implement a 24/7 incident response team | High | Nadia Khan | 2024-03-01 | 2024-07-01 | In Progress | $150K one-time, $10K/month 
+
+Cloud Security Optimization | Optimize AWS cloud security configurations and practices | Medium | Tigan Wang | 2024-02-01 | 2024-06-01 | In Progress | $100K one-time, $8K/month 
+
+S3 Bucket Security | Review and secure all S3 buckets to prevent data breaches | High | Chris Magaan | 2024-01-10 | 2024-04-10 | In Progress | $70K one-time, $5K/month
+
+SQL Injection Mitigation | Implement measures to eliminate SQL injection vulnerabilities | High | Tigan Wang | 2024-01-20 | 2024-05-20 | Not Started | $60K one-time 
+
+## CURRENT STATE (KPIs, Metrics, Project Activity Updates, etc.)
+- October 2022: Current time to detect malicious behavior is 81 hours
+- October 2022: Current time to start investigating malicious behavior is 82 hours
+- October 2022: Current time to remediate critical vulnerabilities on crown jewel systems is 21 days
+- October 2022: Current time to remediate critical vulnerabilities on all systems is 51 days
+- January 2023: Current time to detect malicious behavior is 62 hours
+- January 2023: Current time to start investigating malicious behavior is 72 hours
+- January 2023: Current time to remediate critical vulnerabilities on crown jewel systems is 17 days
+- January 2023: Current time to remediate critical vulnerabilities on all systems is 43 days
+- July 2023: Current time to detect malicious behavior is 29 hours
+- July 2023: Current time to start investigating malicious behavior is 41 hours
+- July 2023: Current time to remediate critical vulnerabilities on crown jewel systems is 12 days
+- July 2023: Current time to remediate critical vulnerabilities on all systems is 29 days
+- November 2023: Current time to start detect malicious behavior is 12 hours
+- November 2023: Current time to start investigating malicious behavior is 16 hours
+- November 2023: Current time to remediate critical vulnerabilities on crown jewel systems is 9 days
+- November 2023: Current time to remediate critical vulnerabilities on all systems is 17 days
+- February 2024: Started attack surface management vendor selection process
+- January 2024: Current time to start detect malicious behavior is 9 hours
+- January 2024: Current time to start investigating malicious behavior is 14 hours
+- January 2024: Current time to remediate critical vulnerabilities on crown jewel systems is 8 days
+- January 2024: Current time to remediate critical vulnerabilities on all systems is 12 days
+- March 2024: We're now remediating crits on crown jewels in less than 6 days
+- April 2024: We're now remediating all criticals within 11 days
+- July 2024: Criticals are now being fixed in 9 days
+- On August 5 we got remediation of critical vulnerabilities down to 7 days

NOTES.md

@@ -2,7 +2,7 @@
 
 - The goal is to bring more encapsulation of the models management and simplified configuration management to bring increased flexibility, transparency on the overall flow, and simplicity in adding new model.
 - We need to differentiate:
-  - Vendors: the producer of models (like OpenAI, Anthropric, Ollama, ..etc) and their associated APIs
+  - Vendors: the producer of models (like OpenAI, Azure, Anthropric, Ollama, ..etc) and their associated APIs
   - Models: the LLM models these vendors are making public
 - Each vendor and operations allowed by the vendor needs to be encapsulated. This includes:
   - The questions needed to setup the model (like the API key, or the URL)

README.md

@@ -14,6 +14,7 @@
 <h4><code>fabric</code> is an open-source framework for augmenting humans using AI.</h4>
 </p>
 
+[Updates](#updates) •
 [What and Why](#whatandwhy) •
 [Philosophy](#philosophy) •
 [Installation](#Installation) •
@@ -28,6 +29,7 @@
 
 ## Navigation
 
+- [Updates](#updates)
 - [What and Why](#what-and-why)
 - [Philosophy](#philosophy)
   - [Breaking problems into components](#breaking-problems-into-components)
@@ -46,16 +48,18 @@
 
 <br />
 
+## Updates
+
 > [!NOTE] 
-August 20, 2024 — We have migrated to Go, and the transition has been pretty smooth! The biggest thing to know is that **the previous installation instructions in the various Fabric videos out there will no longer work** because they were for the legacy (Python) version. Check the new [install instructions](#Installation) below.
->
->
-> **The following command line options were changed during the migration to Go:**
+September 15, 2024 — Lots of new stuff!
+> * Fabric now supports calling the new `o1-preview` model using the `-r` switch (which stands for raw. Normal queries won't work with `o1-preview` because they disabled System access and don't allow us to set `Temperature`.
+> * We have early support for Raycast! Under the `/patterns` directory there's a `raycast` directory with scripts that can be called from Raycast. If you add a scripts directory within Raycast and point it to your `~/.config/fabric/patterns/raycast` directory, you'll then be able to 1) invoke Raycast, type the name of the script, and then 2) paste in the content to be passed, and the results will return in Raycast. There's currently only one script in there but I am (Daniel) adding more.
+> * **Go Migration: The following command line options were changed during the migration to Go:**
 > * You now need to use the -c option instead of -C to copy the result to the clipboard.
 > * You now need to use the -s option instead of -S to stream results in realtime.
-> * The following command line options have been removed --agents (-a), --gui, --clearsession, --remoteOllamaServer, and --sessionlog options 
-> * You can now use --Setup (-S) to configure an Ollama server.
-> * **Please be patient while our developers rewrite the gui in go**
+> * The following command line options have been removed `--agents` (-a), `--gui`, `--clearsession`, `--remoteOllamaServer`, and `--sessionlog`
+> * You can now use (-S) to configure an Ollama server.
+> * **We're working on a GUI rewrite in Go as well**
 
 ## Intro videos
 
@@ -109,6 +113,29 @@ Fabric has Patterns for all sorts of life and work activities, including:
 
 ## Installation
 
+To install Fabric, you can use the latest release binaries or install it from the source.
+
+### Get Latest Release Binaries
+
+```bash
+# Windows:
+curl -L https://github.com/danielmiessler/fabric/releases/latest/download/fabric-windows-amd64.exe > fabric.exe && fabric.exe --version
+
+# MacOS (arm64):
+curl -L https://github.com/danielmiessler/fabric/releases/latest/download/fabric-darwin-arm64 > fabric && chmod +x fabric && ./fabric --version
+
+# MacOS (amd64): 
+curl -L https://github.com/danielmiessler/fabric/releases/latest/download/fabric-darwin-amd64 > fabric && chmod +x fabric && ./fabric --version
+
+# Linux (amd64): 
+curl -L https://github.com/danielmiessler/fabric/releases/latest/download/fabric-linux-amd64 > fabric && chmod +x fabric && ./fabric --version
+
+# Linux (arm64):
+curl -L https://github.com/danielmiessler/fabric/releases/latest/download/fabric-linux-arm64 > fabric && chmod +x fabric && ./fabric --version
+```
+
+### From Source
+
 To install Fabric, [make sure Go is installed](https://go.dev/doc/install), and then run the following command.
 
 ```bash
@@ -133,9 +160,9 @@ export PATH=$GOPATH/bin:$GOROOT/bin:$HOME/.local/bin:$PATH
 for Apple Silicon based macs
 ```bash
 # Golang environment variables
-export GOROOT=/opt/homebrew/bin/go
+export GOROOT=$(brew --prefix go)/libexec
 export GOPATH=$HOME/go
-export PATH=$GOPATH/bin:$GOROOT/bin:$HOME/.local/bin:$PATH:
+export PATH=$GOPATH/bin:$GOROOT/bin:$HOME/.local/bin:$PATH
 ```
 
 ### Setup
@@ -169,7 +196,7 @@ Then [set your environmental variables](#environmental-variables) as shown above
 
 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
+go install -ldflags "-X main.version=$(git describe --tags --always)" github.com/danielmiessler/fabric@latest
 ```
 
 ## Usage
@@ -180,39 +207,52 @@ fabric -h
 ```
 
 ```bash
-usage: fabric -h
+
 Usage:
   fabric [OPTIONS]
 
 Application Options:
-  -p, --pattern=                    Choose a pattern
-  -v, --variable=                   Values for pattern variables, e.g. -v=$name:John -v=$age:30
-  -C, --context=                    Choose a context
-      --session=                    Choose a session
-  -S, --setup                       Run setup
-      --setup-skip-update-patterns  Skip update patterns at setup
-  -t, --temperature=                Set temperature (default: 0.7)
-  -T, --topp=                       Set top P (default: 0.9)
-  -s, --stream                      Stream
-  -P, --presencepenalty=            Set presence penalty (default: 0.0)
-  -F, --frequencypenalty=           Set frequency penalty (default: 0.0)
-  -l, --listpatterns                List all patterns
-  -L, --listmodels                  List all available models
-  -x, --listcontexts                List all contexts
-  -X, --listsessions                List all sessions
-  -U, --updatepatterns              Update patterns
-  -c, --copy                        Copy to clipboard
-  -m, --model=                      Choose model
-  -o, --output=                     Output to file
-  -n, --latest=                     Number of latest patterns to list (default: 0)
-  -d, --changeDefaultModel          Change default pattern
-  -y, --youtube=                    YouTube video url to grab transcript, comments from it and send to chat
-      --transcript                  Grab transcript from YouTube video and send to chat
-      --comments                    Grab comments from YouTube video and send to chat
-      --dry-run                     Show what would be sent to the model without actually sending it
+  -p, --pattern=             Choose a pattern from the available patterns
+  -v, --variable=            Values for pattern variables, e.g. -v=$name:John -v=$age:30
+  -C, --context=             Choose a context from the available contexts
+      --session=             Choose a session from the available sessions
+  -S, --setup                Run setup for all reconfigurable parts of fabric
+      --setup-skip-patterns  Run Setup for all reconfigurable parts of fabric except patterns update
+      --setup-vendor=        Run Setup for specific vendor, one of Ollama, OpenAI, Anthropic, Azure, Gemini, Groq, Mistral, OpenRouter, SiliconCloud. E.g. fabric --setup-vendor=OpenAI
+  -t, --temperature=         Set temperature (default: 0.7)
+  -T, --topp=                Set top P (default: 0.9)
+  -s, --stream               Stream
+  -P, --presencepenalty=     Set presence penalty (default: 0.0)
+  -r, --raw                  Use the defaults of the model without sending chat options (like temperature etc.) and use the user role instead of the system role for patterns.
+  -F, --frequencypenalty=    Set frequency penalty (default: 0.0)
+  -l, --listpatterns         List all patterns
+  -L, --listmodels           List all available models
+  -x, --listcontexts         List all contexts
+  -X, --listsessions         List all sessions
+  -U, --updatepatterns       Update patterns
+  -c, --copy                 Copy to clipboard
+  -m, --model=               Choose model
+  -o, --output=              Output to file
+      --output-session       Output the entire session (also a temporary one) to the output file
+  -n, --latest=              Number of latest patterns to list (default: 0)
+  -d, --changeDefaultModel   Change default model
+  -y, --youtube=             YouTube video "URL" to grab transcript, comments from it and send to chat
+      --transcript           Grab transcript from YouTube video and send to chat (it used per default).
+      --comments             Grab comments from YouTube video and send to chat
+  -g, --language=            Specify the Language Code for the chat, e.g. -g=en -g=zh
+  -u, --scrape_url=          Scrape website URL to markdown using Jina AI
+  -q, --scrape_question=     Search question using Jina AI
+  -e, --seed=                Seed to be used for LMM generation
+  -w, --wipecontext=         Wipe context
+  -W, --wipesession=         Wipe session
+      --printcontext=        Print context
+      --printsession=        Print session
+      --readability          Convert HTML input into a clean, readable view
+      --dry-run              Show what would be sent to the model without actually sending it
+      --version              Print current version
 
 Help Options:
-  -h, --help                        Show this help message
+  -h, --help                 Show this help message
 
 ```
 
@@ -253,7 +293,7 @@ pbpaste | fabric --stream --pattern analyze_claims
 3. Run the `extract_wisdom` Pattern with the `--stream` option to get immediate and streaming results from any Youtube video (much like in the original introduction video).
 
 ```bash
-yt --transcript https://youtube.com/watch?v=uXs-zPc63kM | fabric --stream --pattern extract_wisdom
+fabric -y "https://youtube.com/watch?v=uXs-zPc63kM" | --stream --pattern extract_wisdom
 ```
 
 4. Create patterns- you must create a .md file with the pattern and save it to ~/.config/fabric/patterns/[yourpatternname].
@@ -294,26 +334,6 @@ This feature works with all openai and ollama models but does NOT work with clau
 
 Fabric also makes use of some core helper apps (tools) to make it easier to integrate with your various workflows. Here are some examples:
 
-`yt` is a helper command that extracts the transcript from a YouTube video. You can use it like this:
-```bash
-yt https://www.youtube.com/watch?v=lQVcbY52_gY
-```
-
-This will return the transcript from the video, which you can then pipe into Fabric like this:
-```bash
-yt https://www.youtube.com/watch?v=lQVcbY52_gY | fabric --pattern extract_wisdom
-```
-
-### `yt` Installation
-
-To install `yt`, install it the same way as you install Fabric, just with a different repo name.
-
-```bash
-go install github.com/danielmiessler/yt@latest
-```
-
-Be sure to add your `YOUTUBE_API_KEY` to `~/.config/fabric/.env`.
-
 ### `to_pdf`
 
 `to_pdf` is a helper command that converts LaTeX files to PDF format. You can use it like this:
@@ -337,7 +357,7 @@ This will create a PDF file named `output.pdf` in the current directory.
 To install `to_pdf`, install it the same way as you install Fabric, just with a different repo name.
 
 ```bash
-go install github.com/danielmiessler/fabric/to_pdf/to_pdf@latest
+go install github.com/danielmiessler/fabric/to_pdf@latest
 ```
 
 Make sure you have a LaTeX distribution (like TeX Live or MiKTeX) installed on your system, as `to_pdf` requires `pdflatex` to be available in your system's PATH.

cli/cli.go

@@ -2,6 +2,7 @@ package cli
 
 import (
 	"fmt"
+	"github.com/danielmiessler/fabric/converter"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -12,11 +13,14 @@ import (
 )
 
 // Cli Controls the cli. It takes in the flags and runs the appropriate functions
-func Cli() (message string, err error) {
+func Cli(version string) (err error) {
 	var currentFlags *Flags
 	if currentFlags, err = Init(); err != nil {
-		// we need to reset error, because we don't want to show double help messages
-		err = nil
+		return
+	}
+
+	if currentFlags.Version {
+		fmt.Println(version)
 		return
 	}
 
@@ -28,16 +32,20 @@ func Cli() (message string, err error) {
 	fabricDb := db.NewDb(filepath.Join(homedir, ".config/fabric"))
 
 	// if the setup flag is set, run the setup function
-	if currentFlags.Setup {
+	if currentFlags.Setup || currentFlags.SetupSkipPatterns || currentFlags.SetupVendor != "" {
 		_ = fabricDb.Configure()
-		_, err = Setup(fabricDb, currentFlags.SetupSkipUpdatePatterns)
+		if currentFlags.SetupVendor != "" {
+			_, err = SetupVendor(fabricDb, currentFlags.SetupVendor)
+		} else {
+			_, err = Setup(fabricDb, currentFlags.SetupSkipPatterns)
+		}
 		return
 	}
 
 	var fabric *core.Fabric
 	if err = fabricDb.Configure(); err != nil {
 		fmt.Println("init is failed, run start the setup procedure", err)
-		if fabric, err = Setup(fabricDb, currentFlags.SetupSkipUpdatePatterns); err != nil {
+		if fabric, err = Setup(fabricDb, currentFlags.SetupSkipPatterns); err != nil {
 			return
 		}
 	} else {
@@ -47,7 +55,6 @@ func Cli() (message string, err error) {
 		}
 	}
 
-	// if the update patterns flag is set, run the update patterns function
 	if currentFlags.UpdatePatterns {
 		err = fabric.PopulateDB()
 		return
@@ -58,7 +65,6 @@ func Cli() (message string, err error) {
 		return
 	}
 
-	// if the latest patterns flag is set, run the latest patterns function
 	if currentFlags.LatestPatterns != "0" {
 		var parsedToInt int
 		if parsedToInt, err = strconv.Atoi(currentFlags.LatestPatterns); err != nil {
@@ -71,30 +77,54 @@ func Cli() (message string, err error) {
 		return
 	}
 
-	// if the list patterns flag is set, run the list all patterns function
 	if currentFlags.ListPatterns {
 		err = fabricDb.Patterns.ListNames()
 		return
 	}
 
-	// if the list all models flag is set, run the list all models function
 	if currentFlags.ListAllModels {
 		fabric.GetModels().Print()
 		return
 	}
 
-	// if the list all contexts flag is set, run the list all contexts function
 	if currentFlags.ListAllContexts {
 		err = fabricDb.Contexts.ListNames()
 		return
 	}
 
-	// if the list all sessions flag is set, run the list all sessions function
 	if currentFlags.ListAllSessions {
 		err = fabricDb.Sessions.ListNames()
 		return
 	}
 
+	if currentFlags.WipeContext != "" {
+		err = fabricDb.Contexts.Delete(currentFlags.WipeContext)
+		return
+	}
+
+	if currentFlags.WipeSession != "" {
+		err = fabricDb.Sessions.Delete(currentFlags.WipeSession)
+		return
+	}
+
+	if currentFlags.PrintSession != "" {
+		err = fabricDb.Sessions.PrintSession(currentFlags.PrintSession)
+		return
+	}
+
+	if currentFlags.PrintContext != "" {
+		err = fabricDb.Contexts.PrintContext(currentFlags.PrintContext)
+		return
+	}
+
+	if currentFlags.HtmlReadability {
+		if msg, cleanErr := converter.HtmlReadability(currentFlags.Message); cleanErr != nil {
+			fmt.Println("use original input, because can't apply html readability", err)
+		} else {
+			currentFlags.Message = msg
+		}
+	}
+
 	// if the interactive flag is set, run the interactive function
 	// if currentFlags.Interactive {
 	// 	interactive.Interactive()
@@ -115,17 +145,15 @@ func Cli() (message string, err error) {
 
 		if !currentFlags.YouTubeComments || currentFlags.YouTubeTranscript {
 			var transcript string
-			if transcript, err = fabric.YouTube.GrabTranscript(videoId); err != nil {
+			var language = "en"
+			if currentFlags.Language != "" {
+				language = currentFlags.Language
+			}
+			if transcript, err = fabric.YouTube.GrabTranscript(videoId, language); err != nil {
 				return
 			}
 
-			fmt.Println(transcript)
-
-			if currentFlags.Message != "" {
-				currentFlags.Message = currentFlags.Message + "\n" + transcript
-			} else {
-				currentFlags.Message = transcript
-			}
+			currentFlags.AppendMessage(transcript)
 		}
 
 		if currentFlags.YouTubeComments {
@@ -136,17 +164,40 @@ func Cli() (message string, err error) {
 
 			commentsString := strings.Join(comments, "\n")
 
-			fmt.Println(commentsString)
-
-			if currentFlags.Message != "" {
-				currentFlags.Message = currentFlags.Message + "\n" + commentsString
-			} else {
-				currentFlags.Message = commentsString
-			}
+			currentFlags.AppendMessage(commentsString)
 		}
 
-		if currentFlags.Pattern == "" {
+		if !currentFlags.IsChatRequest() {
 			// if the pattern flag is not set, we wanted only to grab the transcript or comments
+			fmt.Println(currentFlags.Message)
+			return
+		}
+	}
+
+	if (currentFlags.ScrapeURL != "" || currentFlags.ScrapeQuestion != "") && fabric.Jina.IsConfigured() {
+		// Check if the scrape_url flag is set and call ScrapeURL
+		if currentFlags.ScrapeURL != "" {
+			var website string
+			if website, err = fabric.Jina.ScrapeURL(currentFlags.ScrapeURL); err != nil {
+				return
+			}
+
+			currentFlags.AppendMessage(website)
+		}
+
+		// Check if the scrape_question flag is set and call ScrapeQuestion
+		if currentFlags.ScrapeQuestion != "" {
+			var website string
+			if website, err = fabric.Jina.ScrapeQuestion(currentFlags.ScrapeQuestion); err != nil {
+				return
+			}
+
+			currentFlags.AppendMessage(website)
+		}
+
+		if !currentFlags.IsChatRequest() {
+			// if the pattern flag is not set, we wanted only to grab the url or get the answer to the question
+			fmt.Println(currentFlags.Message)
 			return
 		}
 	}
@@ -156,24 +207,33 @@ func Cli() (message string, err error) {
 		return
 	}
 
-	if message, err = chatter.Send(currentFlags.BuildChatRequest(), currentFlags.BuildChatOptions()); err != nil {
+	var session *db.Session
+	if session, err = chatter.Send(currentFlags.BuildChatRequest(strings.Join(os.Args[1:], " ")), currentFlags.BuildChatOptions()); err != nil {
 		return
 	}
 
+	result := session.GetLastMessage().Content
+
 	if !currentFlags.Stream {
-		fmt.Println(message)
+		// print the result if it was not streamed already
+		fmt.Println(result)
 	}
 
 	// if the copy flag is set, copy the message to the clipboard
 	if currentFlags.Copy {
-		if err = fabric.CopyToClipboard(message); err != nil {
+		if err = fabric.CopyToClipboard(result); err != nil {
 			return
 		}
 	}
 
 	// if the output flag is set, create an output file
 	if currentFlags.Output != "" {
-		err = fabric.CreateOutputFile(message, currentFlags.Output)
+		if currentFlags.OutputSession {
+			sessionAsString := session.String()
+			err = fabric.CreateOutputFile(sessionAsString, currentFlags.Output)
+		} else {
+			err = fabric.CreateOutputFile(result, currentFlags.Output)
+		}
 	}
 	return
 }
@@ -193,3 +253,11 @@ func Setup(db *db.Db, skipUpdatePatterns bool) (ret *core.Fabric, err error) {
 	ret = instance
 	return
 }
+
+func SetupVendor(db *db.Db, vendorName string) (ret *core.Fabric, err error) {
+	ret = core.NewFabricForSetup(db)
+	if err = ret.SetupVendor(vendorName); err != nil {
+		return
+	}
+	return
+}

cli/cli_test.go

@@ -1,6 +1,7 @@
 package cli
 
 import (
+	"github.com/danielmiessler/fabric/core"
 	"os"
 	"testing"
 
@@ -9,9 +10,14 @@ import (
 )
 
 func TestCli(t *testing.T) {
-	message, err := Cli()
-	assert.NoError(t, err)
-	assert.Empty(t, message)
+	t.Skip("Skipping test for now, collision with flag -t")
+	originalArgs := os.Args
+	defer func() { os.Args = originalArgs }()
+
+	os.Args = []string{os.Args[0]}
+	err := Cli("test")
+	assert.Error(t, err)
+	assert.Equal(t, core.NoSessionPatternUserMessages, err.Error())
 }
 
 func TestSetup(t *testing.T) {

cli/flags.go

@@ -9,36 +9,50 @@ import (
 
 	"github.com/danielmiessler/fabric/common"
 	"github.com/jessevdk/go-flags"
+	"golang.org/x/text/language"
 )
 
 // Flags create flags struct. the users flags go into this, this will be passed to the chat struct in cli
 type Flags struct {
-	Pattern                 string            `short:"p" long:"pattern" description:"Choose a pattern" default:""`
-	PatternVariables        map[string]string `short:"v" long:"variable" description:"Values for pattern variables, e.g. -v=$name:John -v=$age:30"`
-	Context                 string            `short:"C" long:"context" description:"Choose a context" default:""`
-	Session                 string            `long:"session" description:"Choose a session"`
-	Setup                   bool              `short:"S" long:"setup" description:"Run setup"`
-	SetupSkipUpdatePatterns bool              `long:"setup-skip-update-patterns" description:"Skip update patterns at setup"`
-	Temperature             float64           `short:"t" long:"temperature" description:"Set temperature" default:"0.7"`
-	TopP                    float64           `short:"T" long:"topp" description:"Set top P" default:"0.9"`
-	Stream                  bool              `short:"s" long:"stream" description:"Stream"`
-	PresencePenalty         float64           `short:"P" long:"presencepenalty" description:"Set presence penalty" default:"0.0"`
-	FrequencyPenalty        float64           `short:"F" long:"frequencypenalty" description:"Set frequency penalty" default:"0.0"`
-	ListPatterns            bool              `short:"l" long:"listpatterns" description:"List all patterns"`
-	ListAllModels           bool              `short:"L" long:"listmodels" description:"List all available models"`
-	ListAllContexts         bool              `short:"x" long:"listcontexts" description:"List all contexts"`
-	ListAllSessions         bool              `short:"X" long:"listsessions" description:"List all sessions"`
-	UpdatePatterns          bool              `short:"U" long:"updatepatterns" description:"Update patterns"`
-	Message                 string            `hidden:"true" description:"Message to send to chat"`
-	Copy                    bool              `short:"c" long:"copy" description:"Copy to clipboard"`
-	Model                   string            `short:"m" long:"model" description:"Choose model"`
-	Output                  string            `short:"o" long:"output" description:"Output to file" default:""`
-	LatestPatterns          string            `short:"n" long:"latest" description:"Number of latest patterns to list" default:"0"`
-	ChangeDefaultModel      bool              `short:"d" long:"changeDefaultModel" description:"Change default pattern"`
-	YouTube                 string            `short:"y" long:"youtube" description:"YouTube video url to grab transcript, comments from it and send to chat"`
-	YouTubeTranscript       bool              `long:"transcript" description:"Grab transcript from YouTube video and send to chat"`
-	YouTubeComments         bool              `long:"comments" description:"Grab comments from YouTube video and send to chat"`
-	DryRun                  bool              `long:"dry-run" description:"Show what would be sent to the model without actually sending it"`
+	Pattern            string            `short:"p" long:"pattern" description:"Choose a pattern from the available patterns" default:""`
+	PatternVariables   map[string]string `short:"v" long:"variable" description:"Values for pattern variables, e.g. -v=$name:John -v=$age:30"`
+	Context            string            `short:"C" long:"context" description:"Choose a context from the available contexts" default:""`
+	Session            string            `long:"session" description:"Choose a session from the available sessions"`
+	Setup              bool              `short:"S" long:"setup" description:"Run setup for all reconfigurable parts of fabric"`
+	SetupSkipPatterns  bool              `long:"setup-skip-patterns" description:"Run Setup for all reconfigurable parts of fabric except patterns update"`
+	SetupVendor        string            `long:"setup-vendor" description:"Run Setup for specific vendor, one of Ollama, OpenAI, Anthropic, Azure, Gemini, Groq, Mistral, OpenRouter, SiliconCloud. E.g. fabric --setup-vendor=OpenAI"`
+	Temperature        float64           `short:"t" long:"temperature" description:"Set temperature" default:"0.7"`
+	TopP               float64           `short:"T" long:"topp" description:"Set top P" default:"0.9"`
+	Stream             bool              `short:"s" long:"stream" description:"Stream"`
+	PresencePenalty    float64           `short:"P" long:"presencepenalty" description:"Set presence penalty" default:"0.0"`
+	Raw                bool              `short:"r" long:"raw" description:"Use the defaults of the model without sending chat options (like temperature etc.) and use the user role instead of the system role for patterns."`
+	FrequencyPenalty   float64           `short:"F" long:"frequencypenalty" description:"Set frequency penalty" default:"0.0"`
+	ListPatterns       bool              `short:"l" long:"listpatterns" description:"List all patterns"`
+	ListAllModels      bool              `short:"L" long:"listmodels" description:"List all available models"`
+	ListAllContexts    bool              `short:"x" long:"listcontexts" description:"List all contexts"`
+	ListAllSessions    bool              `short:"X" long:"listsessions" description:"List all sessions"`
+	UpdatePatterns     bool              `short:"U" long:"updatepatterns" description:"Update patterns"`
+	Message            string            `hidden:"true" description:"Message to send to chat"`
+	Copy               bool              `short:"c" long:"copy" description:"Copy to clipboard"`
+	Model              string            `short:"m" long:"model" description:"Choose model"`
+	Output             string            `short:"o" long:"output" description:"Output to file" default:""`
+	OutputSession      bool              `long:"output-session" description:"Output the entire session (also a temporary one) to the output file"`
+	LatestPatterns     string            `short:"n" long:"latest" description:"Number of latest patterns to list" default:"0"`
+	ChangeDefaultModel bool              `short:"d" long:"changeDefaultModel" description:"Change default model"`
+	YouTube            string            `short:"y" long:"youtube" description:"YouTube video \"URL\" to grab transcript, comments from it and send to chat"`
+	YouTubeTranscript  bool              `long:"transcript" description:"Grab transcript from YouTube video and send to chat (it used per default)."`
+	YouTubeComments    bool              `long:"comments" description:"Grab comments from YouTube video and send to chat"`
+	Language           string            `short:"g" long:"language" description:"Specify the Language Code for the chat, e.g. -g=en -g=zh" default:""`
+	ScrapeURL          string            `short:"u" long:"scrape_url" description:"Scrape website URL to markdown using Jina AI"`
+	ScrapeQuestion     string            `short:"q" long:"scrape_question" description:"Search question using Jina AI"`
+	Seed               int               `short:"e" long:"seed" description:"Seed to be used for LMM generation"`
+	WipeContext        string            `short:"w" long:"wipecontext" description:"Wipe context"`
+	WipeSession        string            `short:"W" long:"wipesession" description:"Wipe session"`
+	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"`
+	DryRun             bool              `long:"dry-run" description:"Show what would be sent to the model without actually sending it"`
+	Version            bool              `long:"version" description:"Print current version"`
 }
 
 // Init Initialize flags. returns a Flags struct and an error
@@ -93,17 +107,40 @@ func (o *Flags) BuildChatOptions() (ret *common.ChatOptions) {
 		TopP:             o.TopP,
 		PresencePenalty:  o.PresencePenalty,
 		FrequencyPenalty: o.FrequencyPenalty,
+		Raw:              o.Raw,
+		Seed:             o.Seed,
 	}
 	return
 }
 
-func (o *Flags) BuildChatRequest() (ret *common.ChatRequest) {
+func (o *Flags) BuildChatRequest(Meta string) (ret *common.ChatRequest) {
 	ret = &common.ChatRequest{
 		ContextName:      o.Context,
 		SessionName:      o.Session,
 		PatternName:      o.Pattern,
 		PatternVariables: o.PatternVariables,
 		Message:          o.Message,
+		Meta:             Meta,
+	}
+	if o.Language != "" {
+		langTag, err := language.Parse(o.Language)
+		if err == nil {
+			ret.Language = langTag.String()
+		}
 	}
 	return
 }
+
+func (o *Flags) AppendMessage(message string) {
+	if o.Message != "" {
+		o.Message = o.Message + "\n" + message
+	} else {
+		o.Message = message
+	}
+	return
+}
+
+func (o *Flags) IsChatRequest() (ret bool) {
+	ret = o.Message != "" || o.Session != ""
+	return
+}

cli/flags_test.go

@@ -53,6 +53,7 @@ func TestBuildChatOptions(t *testing.T) {
 		TopP:             0.9,
 		PresencePenalty:  0.1,
 		FrequencyPenalty: 0.2,
+		Seed:             1,
 	}
 
 	expectedOptions := &common.ChatOptions{
@@ -60,6 +61,28 @@ func TestBuildChatOptions(t *testing.T) {
 		TopP:             0.9,
 		PresencePenalty:  0.1,
 		FrequencyPenalty: 0.2,
+		Raw:              false,
+		Seed:             1,
+	}
+	options := flags.BuildChatOptions()
+	assert.Equal(t, expectedOptions, options)
+}
+
+func TestBuildChatOptionsDefaultSeed(t *testing.T) {
+	flags := &Flags{
+		Temperature:      0.8,
+		TopP:             0.9,
+		PresencePenalty:  0.1,
+		FrequencyPenalty: 0.2,
+	}
+
+	expectedOptions := &common.ChatOptions{
+		Temperature:      0.8,
+		TopP:             0.9,
+		PresencePenalty:  0.1,
+		FrequencyPenalty: 0.2,
+		Raw:              false,
+		Seed:             0,
 	}
 	options := flags.BuildChatOptions()
 	assert.Equal(t, expectedOptions, options)
@@ -78,7 +101,8 @@ func TestBuildChatRequest(t *testing.T) {
 		SessionName: "test-session",
 		PatternName: "test-pattern",
 		Message:     "test-message",
+		Meta:        "test",
 	}
-	request := flags.BuildChatRequest()
+	request := flags.BuildChatRequest("test")
 	assert.Equal(t, expectedRequest, request)
 }

common/configurable.go

@@ -103,8 +103,9 @@ func (o *Setting) IsDefined() bool {
 }
 
 func (o *Setting) Configure() error {
-	if o.Value == "" {
-		o.Value = os.Getenv(o.EnvVariable)
+	envValue := os.Getenv(o.EnvVariable)
+	if envValue != "" {
+		o.Value = envValue
 	}
 	return o.IsValidErr()
 }

common/domain.go

@@ -1,5 +1,9 @@
 package common
 
+import goopenai "github.com/sashabaranov/go-openai"
+
+const ChatMessageRoleMeta = "meta"
+
 type Message struct {
 	Role    string `json:"role"`
 	Content string `json:"content"`
@@ -11,6 +15,8 @@ type ChatRequest struct {
 	PatternName      string
 	PatternVariables map[string]string
 	Message          string
+	Language         string
+	Meta             string
 }
 
 type ChatOptions struct {
@@ -19,6 +25,8 @@ type ChatOptions struct {
 	TopP             float64
 	PresencePenalty  float64
 	FrequencyPenalty float64
+	Raw              bool
+	Seed             int
 }
 
 // NormalizeMessages remove empty messages and ensure messages order user-assist-user
@@ -32,8 +40,8 @@ func NormalizeMessages(msgs []*Message, defaultUserMessage string) (ret []*Messa
 		}
 
 		// Ensure, that each odd position shall be a user message
-		if fullMessageIndex%2 == 0 && message.Role != "user" {
-			ret = append(ret, &Message{Role: "user", Content: defaultUserMessage})
+		if fullMessageIndex%2 == 0 && message.Role != goopenai.ChatMessageRoleUser {
+			ret = append(ret, &Message{Role: goopenai.ChatMessageRoleUser, Content: defaultUserMessage})
 			fullMessageIndex++
 		}
 		ret = append(ret, message)

common/domain_test.go

@@ -1,23 +1,24 @@
 package common
 
 import (
+	goopenai "github.com/sashabaranov/go-openai"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )
 
 func TestNormalizeMessages(t *testing.T) {
 	msgs := []*Message{
-		{Role: "user", Content: "Hello"},
-		{Role: "bot", Content: "Hi there!"},
-		{Role: "bot", Content: ""},
-		{Role: "user", Content: ""},
-		{Role: "user", Content: "How are you?"},
+		{Role: goopenai.ChatMessageRoleUser, Content: "Hello"},
+		{Role: goopenai.ChatMessageRoleAssistant, Content: "Hi there!"},
+		{Role: goopenai.ChatMessageRoleUser, Content: ""},
+		{Role: goopenai.ChatMessageRoleUser, Content: ""},
+		{Role: goopenai.ChatMessageRoleUser, Content: "How are you?"},
 	}
 
 	expected := []*Message{
-		{Role: "user", Content: "Hello"},
-		{Role: "bot", Content: "Hi there!"},
-		{Role: "user", Content: "How are you?"},
+		{Role: goopenai.ChatMessageRoleUser, Content: "Hello"},
+		{Role: goopenai.ChatMessageRoleAssistant, Content: "Hi there!"},
+		{Role: goopenai.ChatMessageRoleUser, Content: "How are you?"},
 	}
 
 	actual := NormalizeMessages(msgs, "default")

converter/html_readability.go

@@ -0,0 +1,25 @@
+package converter
+
+import (
+	"bytes"
+	"github.com/go-shiori/go-readability"
+)
+
+// HtmlReadability Convert HTML input into a clean, readable view
+// args：
+//
+//	html (string): full data of web page
+//
+// return：
+//
+//	viewContent (string): html main content
+//	err (error): parser error
+func HtmlReadability(html string) (ret string, err error) {
+	buf := bytes.NewBufferString(html)
+	var article readability.Article
+	if article, err = readability.FromReader(buf, nil); err != nil {
+		return
+	}
+	ret = article.TextContent
+	return
+}

converter/html_readability_test.go

@@ -0,0 +1,46 @@
+package converter
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestHtmlReadability(t *testing.T) {
+	tests := []struct {
+		name     string
+		html     string
+		expected string
+	}{
+		{
+			name:     "Empty HTML",
+			html:     "",
+			expected: "",
+		},
+		{
+			name:     "HTML with text",
+			html:     "<p>Hello World</p>",
+			expected: "Hello World",
+		},
+		{
+			name:     "HTML with nested tags",
+			html:     "<div><p>Hello</p><p>World</p></div>",
+			expected: "HelloWorld",
+		},
+		{
+			name:     "HTML missing tags",
+			html:     "<div><p>Hello</p><p>World</div>",
+			expected: "HelloWorld",
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			result, err := HtmlReadability(tc.html)
+
+			// 验证结果
+			assert.NoError(t, err)
+			assert.Equal(t, tc.expected, result)
+		})
+	}
+}

core/chatter.go

@@ -3,10 +3,11 @@ package core
 import (
 	"context"
 	"fmt"
-
 	"github.com/danielmiessler/fabric/common"
 	"github.com/danielmiessler/fabric/db"
 	"github.com/danielmiessler/fabric/vendors"
+	goopenai "github.com/sashabaranov/go-openai"
+	"strings"
 )
 
 type Chatter struct {
@@ -19,14 +20,8 @@ type Chatter struct {
 	vendor vendors.Vendor
 }
 
-func (o *Chatter) Send(request *common.ChatRequest, opts *common.ChatOptions) (message string, err error) {
-	var chatRequest *Chat
-	if chatRequest, err = o.NewChat(request); err != nil {
-		return
-	}
-
-	var session *db.Session
-	if session, err = chatRequest.BuildChatSession(); err != nil {
+func (o *Chatter) Send(request *common.ChatRequest, opts *common.ChatOptions) (session *db.Session, err error) {
+	if session, err = o.BuildSession(request, opts.Raw); err != nil {
 		return
 	}
 
@@ -34,10 +29,12 @@ func (o *Chatter) Send(request *common.ChatRequest, opts *common.ChatOptions) (m
 		opts.Model = o.model
 	}
 
+	message := ""
+
 	if o.Stream {
 		channel := make(chan string)
 		go func() {
-			if streamErr := o.vendor.SendStream(session.Messages, opts, channel); streamErr != nil {
+			if streamErr := o.vendor.SendStream(session.GetVendorMessages(), opts, channel); streamErr != nil {
 				channel <- streamErr.Error()
 			}
 		}()
@@ -47,39 +44,52 @@ func (o *Chatter) Send(request *common.ChatRequest, opts *common.ChatOptions) (m
 			fmt.Print(response)
 		}
 	} else {
-		if message, err = o.vendor.Send(context.Background(), session.Messages, opts); err != nil {
+		if message, err = o.vendor.Send(context.Background(), session.GetVendorMessages(), opts); err != nil {
 			return
 		}
 	}
 
-	if chatRequest.Session != nil && message != "" {
-		chatRequest.Session.Append(&common.Message{Role: "system", Content: message})
-		err = o.db.Sessions.SaveSession(chatRequest.Session)
+	if message == "" {
+		session = nil
+		err = fmt.Errorf("empty response")
+		return
+	}
+
+	session.Append(&common.Message{Role: goopenai.ChatMessageRoleAssistant, Content: message})
+
+	if session.Name != "" {
+		err = o.db.Sessions.SaveSession(session)
 	}
 	return
 }
 
-func (o *Chatter) NewChat(request *common.ChatRequest) (ret *Chat, err error) {
-	ret = &Chat{}
-
-	if request.ContextName != "" {
-		var ctx *db.Context
-		if ctx, err = o.db.Contexts.GetContext(request.ContextName); err != nil {
-			err = fmt.Errorf("could not find context %s: %v", request.ContextName, err)
-			return
-		}
-		ret.Context = ctx.Content
-	}
-
+func (o *Chatter) BuildSession(request *common.ChatRequest, raw bool) (session *db.Session, err error) {
 	if request.SessionName != "" {
 		var sess *db.Session
 		if sess, err = o.db.Sessions.GetOrCreateSession(request.SessionName); err != nil {
 			err = fmt.Errorf("could not find session %s: %v", request.SessionName, err)
 			return
 		}
-		ret.Session = sess
+		session = sess
+	} else {
+		session = &db.Session{}
 	}
 
+	if request.Meta != "" {
+		session.Append(&common.Message{Role: common.ChatMessageRoleMeta, Content: request.Meta})
+	}
+
+	var contextContent string
+	if request.ContextName != "" {
+		var ctx *db.Context
+		if ctx, err = o.db.Contexts.GetContext(request.ContextName); err != nil {
+			err = fmt.Errorf("could not find context %s: %v", request.ContextName, err)
+			return
+		}
+		contextContent = ctx.Content
+	}
+
+	var patternContent string
 	if request.PatternName != "" {
 		var pattern *db.Pattern
 		if pattern, err = o.db.Patterns.GetPattern(request.PatternName, request.PatternVariables); err != nil {
@@ -88,17 +98,34 @@ func (o *Chatter) NewChat(request *common.ChatRequest) (ret *Chat, err error) {
 		}
 
 		if pattern.Pattern != "" {
-			ret.Pattern = pattern.Pattern
+			patternContent = pattern.Pattern
 		}
 	}
 
-	ret.Message = request.Message
+	systemMessage := strings.TrimSpace(contextContent) + strings.TrimSpace(patternContent)
+	if request.Language != "" {
+		systemMessage = fmt.Sprintf("%s. Please use the language '%s' for the output.", systemMessage, request.Language)
+	}
+	userMessage := strings.TrimSpace(request.Message)
+
+	if raw {
+		// use the user role instead of the system role in raw mode
+		message := systemMessage + userMessage
+		if message != "" {
+			session.Append(&common.Message{Role: goopenai.ChatMessageRoleUser, Content: message})
+		}
+	} else {
+		if systemMessage != "" {
+			session.Append(&common.Message{Role: goopenai.ChatMessageRoleSystem, Content: systemMessage})
+		}
+		if userMessage != "" {
+			session.Append(&common.Message{Role: goopenai.ChatMessageRoleUser, Content: userMessage})
+		}
+	}
+
+	if session.IsEmpty() {
+		session = nil
+		err = fmt.Errorf(NoSessionPatternUserMessages)
+	}
 	return
 }
-
-type Chat struct {
-	Context string
-	Pattern string
-	Message string
-	Session *db.Session
-}

core/chatter_test.go

@@ -1,21 +0,0 @@
-package core
-
-import (
-	"testing"
-)
-
-func TestBuildChatSession(t *testing.T) {
-	chat := &Chat{
-		Context: "test context",
-		Pattern: "test pattern",
-		Message: "test message",
-	}
-	session, err := chat.BuildChatSession()
-	if err != nil {
-		t.Fatalf("BuildChatSession() error = %v", err)
-	}
-
-	if session == nil {
-		t.Fatalf("BuildChatSession() returned nil session")
-	}
-}

core/fabric.go

@@ -3,29 +3,31 @@ package core
 import (
 	"bytes"
 	"fmt"
-	"github.com/danielmiessler/fabric/vendors/groq"
-	"os"
-	"strconv"
-	"strings"
-
 	"github.com/atotto/clipboard"
 	"github.com/danielmiessler/fabric/common"
 	"github.com/danielmiessler/fabric/db"
+	"github.com/danielmiessler/fabric/jina"
 	"github.com/danielmiessler/fabric/vendors/anthropic"
 	"github.com/danielmiessler/fabric/vendors/azure"
 	"github.com/danielmiessler/fabric/vendors/dryrun"
 	"github.com/danielmiessler/fabric/vendors/gemini"
+	"github.com/danielmiessler/fabric/vendors/groq"
+	"github.com/danielmiessler/fabric/vendors/mistral"
 	"github.com/danielmiessler/fabric/vendors/ollama"
 	"github.com/danielmiessler/fabric/vendors/openai"
 	"github.com/danielmiessler/fabric/vendors/openrouter"
 	"github.com/danielmiessler/fabric/vendors/siliconcloud"
 	"github.com/danielmiessler/fabric/youtube"
 	"github.com/pkg/errors"
+	"os"
+	"strconv"
 )
 
 const DefaultPatternsGitRepoUrl = "https://github.com/danielmiessler/fabric.git"
 const DefaultPatternsGitRepoFolder = "patterns"
 
+const NoSessionPatternUserMessages = "no session, pattern or user messages provided"
+
 func NewFabric(db *db.Db) (ret *Fabric, err error) {
 	ret = NewFabricBase(db)
 	err = ret.Configure()
@@ -47,6 +49,7 @@ func NewFabricBase(db *db.Db) (ret *Fabric) {
 		VendorsAll:     NewVendorsManager(),
 		PatternsLoader: NewPatternsLoader(db.Patterns),
 		YouTube:        youtube.NewYouTube(),
+		Jina:           jina.NewClient(),
 	}
 
 	label := "Default"
@@ -61,7 +64,7 @@ func NewFabricBase(db *db.Db) (ret *Fabric) {
 		"Enter the index the name of your default model")
 
 	ret.VendorsAll.AddVendors(openai.NewClient(), azure.NewClient(), ollama.NewClient(), groq.NewClient(),
-		gemini.NewClient(), anthropic.NewClient(), siliconcloud.NewClient(), openrouter.NewClient())
+		gemini.NewClient(), anthropic.NewClient(), siliconcloud.NewClient(), openrouter.NewClient(), mistral.NewClient(), dryrun.NewClient())
 
 	return
 }
@@ -72,6 +75,7 @@ type Fabric struct {
 	VendorsAll *VendorsManager
 	*PatternsLoader
 	*youtube.YouTube
+	Jina *jina.Client
 
 	Db *db.Db
 
@@ -96,6 +100,7 @@ func (o *Fabric) SaveEnvFile() (err error) {
 	}
 
 	o.YouTube.SetupFillEnvFileContent(&envFileContent)
+	o.Jina.SetupFillEnvFileContent(&envFileContent)
 
 	err = o.Db.SaveEnv(envFileContent.String())
 	return
@@ -112,6 +117,10 @@ func (o *Fabric) Setup() (err error) {
 
 	_ = o.YouTube.SetupOrSkip()
 
+	if err = o.Jina.SetupOrSkip(); err != nil {
+		return
+	}
+
 	if err = o.PatternsLoader.Setup(); err != nil {
 		return
 	}
@@ -169,6 +178,14 @@ func (o *Fabric) SetupVendors() (err error) {
 	return
 }
 
+func (o *Fabric) SetupVendor(vendorName string) (err error) {
+	if err = o.VendorsAll.SetupVendor(vendorName); err != nil {
+		return
+	}
+	err = o.SaveEnvFile()
+	return
+}
+
 // Configure buildClient VendorsController based on the environment variables
 func (o *Fabric) configure() (err error) {
 	for _, vendor := range o.VendorsAll.Vendors {
@@ -180,8 +197,9 @@ func (o *Fabric) configure() (err error) {
 		return
 	}
 
-	//YouTube is not mandatory, so ignore not configured error
+	//YouTube and Jina are not mandatory, so ignore not configured error
 	_ = o.YouTube.Configure()
+	_ = o.Jina.Configure()
 
 	return
 }
@@ -235,29 +253,3 @@ func (o *Fabric) CreateOutputFile(message string, fileName string) (err error) {
 	}
 	return
 }
-
-func (o *Chat) BuildChatSession() (ret *db.Session, err error) {
-	// new messages will be appended to the session and used to send the message
-	if o.Session != nil {
-		ret = o.Session
-	} else {
-		ret = &db.Session{}
-	}
-
-	systemMessage := strings.TrimSpace(o.Context) + strings.TrimSpace(o.Pattern)
-
-	if systemMessage != "" {
-		ret.Append(&common.Message{Role: "system", Content: systemMessage})
-	}
-
-	userMessage := strings.TrimSpace(o.Message)
-	if userMessage != "" {
-		ret.Append(&common.Message{Role: "user", Content: userMessage})
-	}
-
-	if ret.IsEmpty() {
-		ret = nil
-		err = fmt.Errorf("no session, pattern or user messages provided")
-	}
-	return
-}

core/vendors.go

@@ -100,6 +100,19 @@ func (o *VendorsManager) Setup() (ret map[string]vendors.Vendor, err error) {
 	return
 }
 
+func (o *VendorsManager) SetupVendor(vendorName string) (err error) {
+	vendor := o.FindByName(vendorName)
+	if vendor == nil {
+		err = fmt.Errorf("vendor %s not found", vendorName)
+		return
+	}
+	err = vendor.Setup()
+	if err != nil {
+		return
+	}
+	return
+}
+
 type modelResult struct {
 	vendorName string
 	models     []string

db/contexts.go

@@ -1,5 +1,7 @@
 package db
 
+import "fmt"
+
 type Contexts struct {
 	*Storage
 }
@@ -15,6 +17,15 @@ func (o *Contexts) GetContext(name string) (ret *Context, err error) {
 	return
 }
 
+func (o *Contexts) PrintContext(name string) (err error) {
+	var context *Context
+	if context, err = o.GetContext(name); err != nil {
+		return
+	}
+	fmt.Println(context.Content)
+	return
+}
+
 type Context struct {
 	Name    string
 	Content string

db/sessions.go

@@ -20,6 +20,16 @@ func (o *Sessions) GetOrCreateSession(name string) (session *Session, err error)
 	return
 }
 
+func (o *Sessions) PrintSession(name string) (err error) {
+	if o.Exists(name) {
+		var session Session
+		if err = o.LoadAsJson(name, &session.Messages); err == nil {
+			fmt.Println(session.String())
+		}
+	}
+	return
+}
+
 func (o *Sessions) SaveSession(session *Session) (err error) {
 	return o.SaveAsJson(session.Name, session.Messages)
 }
@@ -27,6 +37,8 @@ func (o *Sessions) SaveSession(session *Session) (err error) {
 type Session struct {
 	Name     string
 	Messages []*common.Message
+
+	vendorMessages []*common.Message
 }
 
 func (o *Session) IsEmpty() bool {
@@ -34,5 +46,43 @@ func (o *Session) IsEmpty() bool {
 }
 
 func (o *Session) Append(messages ...*common.Message) {
-	o.Messages = append(o.Messages, messages...)
+	if o.vendorMessages != nil {
+		for _, message := range messages {
+			o.Messages = append(o.Messages, message)
+			o.appendVendorMessage(message)
+		}
+	} else {
+		o.Messages = append(o.Messages, messages...)
+	}
+}
+
+func (o *Session) GetVendorMessages() (ret []*common.Message) {
+	if o.vendorMessages == nil {
+		o.vendorMessages = []*common.Message{}
+		for _, message := range o.Messages {
+			o.appendVendorMessage(message)
+		}
+	}
+	ret = o.vendorMessages
+	return
+}
+
+func (o *Session) appendVendorMessage(message *common.Message) {
+	if message.Role != common.ChatMessageRoleMeta {
+		o.vendorMessages = append(o.vendorMessages, message)
+	}
+}
+
+func (o *Session) GetLastMessage() (ret *common.Message) {
+	if len(o.Messages) > 0 {
+		ret = o.Messages[len(o.Messages)-1]
+	}
+	return
+}
+
+func (o *Session) String() (ret string) {
+	for _, message := range o.Messages {
+		ret += fmt.Sprintf("\n--- \n[%v]\n\n%v", message.Role, message.Content)
+	}
+	return
 }

db/storage.go

@@ -3,10 +3,11 @@ package db
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/samber/lo"
 	"os"
 	"path/filepath"
 	"strings"
+
+	"github.com/samber/lo"
 )
 
 type Storage struct {
@@ -69,9 +70,8 @@ func (o *Storage) ListNames() (err error) {
 		return
 	}
 
-	fmt.Printf("\n%v:\n", o.Label)
 	for _, item := range names {
-		fmt.Printf("\t%s\n", item)
+		fmt.Printf("%s\n", item)
 	}
 	return
 }

go.mod

@@ -2,37 +2,39 @@ module github.com/danielmiessler/fabric
 
 go 1.22.5
 
-toolchain go1.22.6
-
 require (
+	github.com/anaskhan96/soup v1.2.5
 	github.com/atotto/clipboard v0.1.4
 	github.com/go-git/go-git/v5 v5.12.0
-	github.com/google/generative-ai-go v0.17.0
+	github.com/go-shiori/go-readability v0.0.0-20240923125239-59a7bd165825
+	github.com/google/generative-ai-go v0.18.0
 	github.com/jessevdk/go-flags v1.6.1
 	github.com/joho/godotenv v1.5.1
-	github.com/liushuangls/go-anthropic/v2 v2.6.0
-	github.com/ollama/ollama v0.3.6
+	github.com/liushuangls/go-anthropic/v2 v2.8.0
+	github.com/ollama/ollama v0.3.11
 	github.com/otiai10/copy v1.14.0
 	github.com/pkg/errors v0.9.1
 	github.com/samber/lo v1.47.0
-	github.com/sashabaranov/go-openai v1.28.2
+	github.com/sashabaranov/go-openai v1.30.0
 	github.com/stretchr/testify v1.9.0
-	google.golang.org/api v0.192.0
+	golang.org/x/text v0.18.0
+	google.golang.org/api v0.197.0
 )
 
 require (
-	cloud.google.com/go v0.115.0 // indirect
-	cloud.google.com/go/ai v0.8.0 // indirect
-	cloud.google.com/go/auth v0.8.1 // indirect
-	cloud.google.com/go/auth/oauth2adapt v0.2.3 // indirect
-	cloud.google.com/go/compute/metadata v0.5.0 // indirect
-	cloud.google.com/go/longrunning v0.5.7 // indirect
-	dario.cat/mergo v1.0.0 // indirect
-	github.com/Microsoft/go-winio v0.6.1 // indirect
+	cloud.google.com/go v0.115.1 // indirect
+	cloud.google.com/go/ai v0.8.2 // indirect
+	cloud.google.com/go/auth v0.9.4 // indirect
+	cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
+	cloud.google.com/go/compute/metadata v0.5.1 // indirect
+	cloud.google.com/go/longrunning v0.6.1 // indirect
+	dario.cat/mergo v1.0.1 // indirect
+	github.com/Microsoft/go-winio v0.6.2 // indirect
 	github.com/ProtonMail/go-crypto v1.0.0 // indirect
-	github.com/anaskhan96/soup v1.2.5 // indirect
-	github.com/cloudflare/circl v1.3.7 // indirect
-	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
+	github.com/andybalholm/cascadia v1.3.2 // indirect
+	github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de // indirect
+	github.com/cloudflare/circl v1.4.0 // indirect
+	github.com/cyphar/filepath-securejoin v0.3.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
@@ -40,36 +42,35 @@ require (
 	github.com/go-git/go-billy/v5 v5.5.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/go-shiori/dom v0.0.0-20230515143342-73569d674e1c // indirect
+	github.com/gogs/chardet v0.0.0-20211120154057-b7413eaefb8f // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/google/s2a-go v0.1.8 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
+	github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
 	github.com/googleapis/gax-go/v2 v2.13.0 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
 	github.com/kevinburke/ssh_config v1.2.0 // indirect
 	github.com/pjbgf/sha1cd v0.3.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
-	github.com/skeema/knownhosts v1.2.2 // indirect
+	github.com/skeema/knownhosts v1.3.0 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0 // indirect
-	go.opentelemetry.io/otel v1.26.0 // indirect
-	go.opentelemetry.io/otel/metric v1.26.0 // indirect
-	go.opentelemetry.io/otel/trace v1.26.0 // indirect
-	golang.org/x/crypto v0.25.0 // indirect
-	golang.org/x/mod v0.17.0 // indirect
-	golang.org/x/net v0.27.0 // indirect
-	golang.org/x/oauth2 v0.22.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.55.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 // indirect
+	go.opentelemetry.io/otel v1.30.0 // indirect
+	go.opentelemetry.io/otel/metric v1.30.0 // indirect
+	go.opentelemetry.io/otel/trace v1.30.0 // indirect
+	golang.org/x/crypto v0.27.0 // indirect
+	golang.org/x/net v0.29.0 // indirect
+	golang.org/x/oauth2 v0.23.0 // indirect
 	golang.org/x/sync v0.8.0 // indirect
-	golang.org/x/sys v0.24.0 // indirect
-	golang.org/x/text v0.16.0 // indirect
+	golang.org/x/sys v0.25.0 // indirect
 	golang.org/x/time v0.6.0 // indirect
-	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20240711142825-46eb208f015d // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf // indirect
-	google.golang.org/grpc v1.64.1 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
+	google.golang.org/grpc v1.66.2 // indirect
 	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect

go.sum

@@ -1,28 +1,32 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.115.0 h1:CnFSK6Xo3lDYRoBKEcAtia6VSC837/ZkJuRduSFnr14=
-cloud.google.com/go v0.115.0/go.mod h1:8jIM5vVgoAEoiVxQ/O4BFTfHqulPZgs/ufEzMcFMdWU=
-cloud.google.com/go/ai v0.8.0 h1:rXUEz8Wp2OlrM8r1bfmpF2+VKqc1VJpafE3HgzRnD/w=
-cloud.google.com/go/ai v0.8.0/go.mod h1:t3Dfk4cM61sytiggo2UyGsDVW3RF1qGZaUKDrZFyqkE=
-cloud.google.com/go/auth v0.8.1 h1:QZW9FjC5lZzN864p13YxvAtGUlQ+KgRL+8Sg45Z6vxo=
-cloud.google.com/go/auth v0.8.1/go.mod h1:qGVp/Y3kDRSDZ5gFD/XPUfYQ9xW1iI7q8RIRoCyBbJc=
-cloud.google.com/go/auth/oauth2adapt v0.2.3 h1:MlxF+Pd3OmSudg/b1yZ5lJwoXCEaeedAguodky1PcKI=
-cloud.google.com/go/auth/oauth2adapt v0.2.3/go.mod h1:tMQXOfZzFuNuUxOypHlQEXgdfX5cuhwU+ffUuXRJE8I=
-cloud.google.com/go/compute/metadata v0.5.0 h1:Zr0eK8JbFv6+Wi4ilXAR8FJ3wyNdpxHKJNPos6LTZOY=
-cloud.google.com/go/compute/metadata v0.5.0/go.mod h1:aHnloV2TPI38yx4s9+wAZhHykWvVCfu7hQbF+9CWoiY=
-cloud.google.com/go/longrunning v0.5.7 h1:WLbHekDbjK1fVFD3ibpFFVoyizlLRl73I7YKuAKilhU=
-cloud.google.com/go/longrunning v0.5.7/go.mod h1:8GClkudohy1Fxm3owmBGid8W0pSgodEMwEAztp38Xng=
-dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
-dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
+cloud.google.com/go v0.115.1 h1:Jo0SM9cQnSkYfp44+v+NQXHpcHqlnRJk2qxh6yvxxxQ=
+cloud.google.com/go v0.115.1/go.mod h1:DuujITeaufu3gL68/lOFIirVNJwQeyf5UXyi+Wbgknc=
+cloud.google.com/go/ai v0.8.2 h1:LEaQwqBv+k2ybrcdTtCTc9OPZXoEdcQaGrfvDYS6Bnk=
+cloud.google.com/go/ai v0.8.2/go.mod h1:Wb3EUUGWwB6yHBaUf/+oxUq/6XbCaU1yh0GrwUS8lr4=
+cloud.google.com/go/auth v0.9.4 h1:DxF7imbEbiFu9+zdKC6cKBko1e8XeJnipNqIbWZ+kDI=
+cloud.google.com/go/auth v0.9.4/go.mod h1:SHia8n6//Ya940F1rLimhJCjjx7KE17t0ctFEci3HkA=
+cloud.google.com/go/auth/oauth2adapt v0.2.4 h1:0GWE/FUsXhf6C+jAkWgYm7X9tK8cuEIfy19DBn6B6bY=
+cloud.google.com/go/auth/oauth2adapt v0.2.4/go.mod h1:jC/jOpwFP6JBxhB3P5Rr0a9HLMC/Pe3eaL4NmdvqPtc=
+cloud.google.com/go/compute/metadata v0.5.1 h1:NM6oZeZNlYjiwYje+sYFjEpP0Q0zCan1bmQW/KmIrGs=
+cloud.google.com/go/compute/metadata v0.5.1/go.mod h1:C66sj2AluDcIqakBq/M8lw8/ybHgOZqin2obFxa/E5k=
+cloud.google.com/go/longrunning v0.6.1 h1:lOLTFxYpr8hcRtcwWir5ITh1PAKUD/sG2lKrTSYjyMc=
+cloud.google.com/go/longrunning v0.6.1/go.mod h1:nHISoOZpBcmlwbJmiVk5oDRz0qG/ZxPynEGs1iZ79s0=
+dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
+dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
-github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
-github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
+github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
+github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
 github.com/ProtonMail/go-crypto v1.0.0 h1:LRuvITjQWX+WIfr930YHG2HNfjR1uOfyf5vE0kC2U78=
 github.com/ProtonMail/go-crypto v1.0.0/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0=
 github.com/anaskhan96/soup v1.2.5 h1:V/FHiusdTrPrdF4iA1YkVxsOpdNcgvqT1hG+YtcZ5hM=
 github.com/anaskhan96/soup v1.2.5/go.mod h1:6YnEp9A2yywlYdM4EgDz9NEHclocMepEtku7wg6Cq3s=
+github.com/andybalholm/cascadia v1.3.2 h1:3Xi6Dw5lHF15JtdcmAHD3i1+T8plmv7BQ/nsViSLyss=
+github.com/andybalholm/cascadia v1.3.2/go.mod h1:7gtRlve5FxPPgIgX36uWBX58OdBsSS6lUvCFb+h7KvU=
 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
+github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de h1:FxWPpzIjnTlhPwqqXc4/vE0f7GvRjuAsbW+HOIe8KnA=
+github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de/go.mod h1:DCaWoUhZrYW9p1lxo/cm8EmUOOzAPSEZNGF2DK1dJgw=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
@@ -31,11 +35,11 @@ github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7N
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA=
-github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
-github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
+github.com/cloudflare/circl v1.4.0 h1:BV7h5MgrktNzytKmWjpOtdYrf0lkkbF8YMlBGPhJQrY=
+github.com/cloudflare/circl v1.4.0/go.mod h1:PDRU+oXvdD7KCtgKxW95M5Z8BpSCJXQORiZFnBQS5QU=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg=
-github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
+github.com/cyphar/filepath-securejoin v0.3.2 h1:QhZu5AxQ+o1XZH0Ye05YzvJ0kAdK6VQc0z9NNMek7gc=
+github.com/cyphar/filepath-securejoin v0.3.2/go.mod h1:F7i41x/9cBF7lzCrVsYs9fuzwRZm4NQsGTBdpp6mETc=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -64,6 +68,12 @@ github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
 github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
+github.com/go-shiori/dom v0.0.0-20230515143342-73569d674e1c h1:wpkoddUomPfHiOziHZixGO5ZBS73cKqVzZipfrLmO1w=
+github.com/go-shiori/dom v0.0.0-20230515143342-73569d674e1c/go.mod h1:oVDCh3qjJMLVUSILBRwrm+Bc6RNXGZYtoh9xdvf1ffM=
+github.com/go-shiori/go-readability v0.0.0-20240923125239-59a7bd165825 h1:CpSi7xiWqGaAqVn/2MsbRoDmPwXMvvQUu3hLjX1QrOM=
+github.com/go-shiori/go-readability v0.0.0-20240923125239-59a7bd165825/go.mod h1:YWa00ashoPZMAOElrSn4E1cJErhDVU6PWAll4Hxzn+w=
+github.com/gogs/chardet v0.0.0-20211120154057-b7413eaefb8f h1:3BSP1Tbs2djlpprl7wCLuiqMaUh5SJkkzI2gDs+FgLs=
+github.com/gogs/chardet v0.0.0-20211120154057-b7413eaefb8f/go.mod h1:Pcatq5tYkCW2Q6yrR2VRHlbHpZ/R4/7qyL1TCF7vl14=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
@@ -80,8 +90,8 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
-github.com/google/generative-ai-go v0.17.0 h1:kUmCXUIwJouD7I7ev3OmxzzQVICyhIWAxaXk2yblCMY=
-github.com/google/generative-ai-go v0.17.0/go.mod h1:JYolL13VG7j79kM5BtHz4qwONHkeJQzOCkKXnpqtS/E=
+github.com/google/generative-ai-go v0.18.0 h1:6ybg9vOCLcI/UpBBYXOTVgvKmcUKFRNj+2Cj3GnebSo=
+github.com/google/generative-ai-go v0.18.0/go.mod h1:JYolL13VG7j79kM5BtHz4qwONHkeJQzOCkKXnpqtS/E=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
@@ -95,8 +105,8 @@ github.com/google/s2a-go v0.1.8/go.mod h1:6iNWHTpQ+nfNRN5E00MSdfDwVesa8hhS32PhPO
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs=
-github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0=
+github.com/googleapis/enterprise-certificate-proxy v0.3.4 h1:XYIDZApgAnrN1c855gTgghdIA6Stxb52D5RnLI1SLyw=
+github.com/googleapis/enterprise-certificate-proxy v0.3.4/go.mod h1:YKe7cfqYXjKGpGvmSg28/fFvhNzinZQm8DGnaburhGA=
 github.com/googleapis/gax-go/v2 v2.13.0 h1:yitjD5f7jQHhyDsnhKEBU52NdvvdSeGzlAnDPT0hH1s=
 github.com/googleapis/gax-go/v2 v2.13.0/go.mod h1:Z/fvTZXF8/uw7Xu5GuslPw+bplx6SS338j1Is2S+B7A=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
@@ -114,10 +124,11 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/liushuangls/go-anthropic/v2 v2.6.0 h1:hkgLQPD04wL4lFrV5ZoGlIyy4f6P+brIuRlzn2S8K9s=
-github.com/liushuangls/go-anthropic/v2 v2.6.0/go.mod h1:8BKv/fkeTaL5R9R9bGkaknYBueyw2WxY20o7bImbOek=
-github.com/ollama/ollama v0.3.6 h1:nA/N0AmjP327po5cZDGLqI40nl+aeei0pD0dLa92ypE=
-github.com/ollama/ollama v0.3.6/go.mod h1:YrWoNkFnPOYsnDvsf/Ztb1wxU9/IXrNsQHqcxbY2r94=
+github.com/liushuangls/go-anthropic/v2 v2.8.0 h1:0zH2jDNycbrlszxnLrG+Gx8vVT0yJAPWU4s3ZTkWzgI=
+github.com/liushuangls/go-anthropic/v2 v2.8.0/go.mod h1:8BKv/fkeTaL5R9R9bGkaknYBueyw2WxY20o7bImbOek=
+github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
+github.com/ollama/ollama v0.3.11 h1:Fs1B5WjXYUvr5bkMZZpUJfiqIAxrymujRidFABwMeV8=
+github.com/ollama/ollama v0.3.11/go.mod h1:YrWoNkFnPOYsnDvsf/Ztb1wxU9/IXrNsQHqcxbY2r94=
 github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI=
 github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M=
 github.com/otiai10/copy v1.14.0 h1:dCI/t1iTdYGtkvCuBG2BgR6KZa83PTclw4U5n2wAllU=
@@ -131,23 +142,26 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
 github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
 github.com/samber/lo v1.47.0 h1:z7RynLwP5nbyRscyvcD043DWYoOcYRv3mV8lBeqOCLc=
 github.com/samber/lo v1.47.0/go.mod h1:RmDH9Ct32Qy3gduHQuKJ3gW1fMHAnE/fAzQuf6He5cU=
-github.com/sashabaranov/go-openai v1.28.2 h1:Q3pi34SuNYNN7YrqpHlHbpeYlf75ljgHOAVM/r1yun0=
-github.com/sashabaranov/go-openai v1.28.2/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg=
+github.com/sashabaranov/go-openai v1.30.0 h1:fHv9urGxABfm885xGWsXFSk5cksa+8dJ4jGli/UQQcI=
+github.com/sashabaranov/go-openai v1.30.0/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg=
+github.com/scylladb/termtables v0.0.0-20191203121021-c4c0b6d42ff4/go.mod h1:C1a7PQSMz9NShzorzCiG2fk9+xuCgLkPeCvMHYR2OWg=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
-github.com/skeema/knownhosts v1.2.2 h1:Iug2P4fLmDw9f41PB6thxUkNUkJzB5i+1/exaj40L3A=
-github.com/skeema/knownhosts v1.2.2/go.mod h1:xYbVRSPxqBZFrdmDyMmsOs+uX1UZC3nTN3ThzgDxUwo=
+github.com/skeema/knownhosts v1.3.0 h1:AM+y0rI04VksttfwjkSTNQorvGqmwATnvnAHpSgc0LY=
+github.com/skeema/knownhosts v1.3.0/go.mod h1:sPINvnADmT/qYH1kfv+ePMmOBTH6Tbl7b5LvTDjFK7M=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
@@ -158,32 +172,30 @@ github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
 go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0 h1:A3SayB3rNyt+1S6qpI9mHPkeHTZbD7XILEqWnYZb2l0=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0/go.mod h1:27iA5uvhuRNmalO+iEUdVn5ZMj2qy10Mm+XRIpRmyuU=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0 h1:Xs2Ncz0gNihqu9iosIZ5SkBbWo5T8JhhLJFMQL1qmLI=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0/go.mod h1:vy+2G/6NvVMpwGX/NyLqcC41fxepnuKHk16E6IZUcJc=
-go.opentelemetry.io/otel v1.26.0 h1:LQwgL5s/1W7YiiRwxf03QGnWLb2HW4pLiAhaA5cZXBs=
-go.opentelemetry.io/otel v1.26.0/go.mod h1:UmLkJHUAidDval2EICqBMbnAd0/m2vmpf/dAM+fvFs4=
-go.opentelemetry.io/otel/metric v1.26.0 h1:7S39CLuY5Jgg9CrnA9HHiEjGMF/X2VHvoXGgSllRz30=
-go.opentelemetry.io/otel/metric v1.26.0/go.mod h1:SY+rHOI4cEawI9a7N1A4nIg/nTQXe1ccCNWYOJUrpX4=
-go.opentelemetry.io/otel/trace v1.26.0 h1:1ieeAUb4y0TE26jUFrCIXKpTuVK7uJGN9/Z/2LP5sQA=
-go.opentelemetry.io/otel/trace v1.26.0/go.mod h1:4iDxvGDQuUkHve82hJJ8UqrwswHYsZuWCBllGV2U2y0=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.55.0 h1:hCq2hNMwsegUvPzI7sPOvtO9cqyy5GbWt/Ybp2xrx8Q=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.55.0/go.mod h1:LqaApwGx/oUmzsbqxkzuBvyoPpkxk3JQWnqfVrJ3wCA=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 h1:ZIg3ZT/aQ7AfKqdwp7ECpOK6vHqquXXuyTjIO8ZdmPs=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0/go.mod h1:DQAwmETtZV00skUwgD6+0U89g80NKsJE3DCKeLLPQMI=
+go.opentelemetry.io/otel v1.30.0 h1:F2t8sK4qf1fAmY9ua4ohFS/K+FUuOPemHUIXHtktrts=
+go.opentelemetry.io/otel v1.30.0/go.mod h1:tFw4Br9b7fOS+uEao81PJjVMjW/5fvNCbpsDIXqP0pc=
+go.opentelemetry.io/otel/metric v1.30.0 h1:4xNulvn9gjzo4hjg+wzIKG7iNFEaBMX00Qd4QIZs7+w=
+go.opentelemetry.io/otel/metric v1.30.0/go.mod h1:aXTfST94tswhWEb+5QjlSqG+cZlmyXy/u8jFpor3WqQ=
+go.opentelemetry.io/otel/trace v1.30.0 h1:7UBkkYzeg3C7kQX8VAidWh2biiQbtAKjyIML8dQ9wmc=
+go.opentelemetry.io/otel/trace v1.30.0/go.mod h1:5EyKqTzzmyqB9bwtCCq6pDLktPK6fmGf/Dph+8VI02o=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
 golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
-golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
-golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
+golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
+golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
-golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -198,11 +210,12 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
 golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
-golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
-golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
+golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
+golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
+golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA=
-golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
+golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs=
+golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -226,15 +239,17 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
-golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
+golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
-golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk=
-golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4=
+golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
+golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM=
+golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -242,8 +257,9 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
-golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
+golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U=
 golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -254,28 +270,26 @@ golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBn
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.192.0 h1:PljqpNAfZaaSpS+TnANfnNAXKdzHM/B9bKhwRlo7JP0=
-google.golang.org/api v0.192.0/go.mod h1:9VcphjvAxPKLmSxVSzPlSRXy/5ARMEw5bf58WoVXafQ=
+google.golang.org/api v0.197.0 h1:x6CwqQLsFiA5JKAiGyGBjc2bNtHtLddhJCE2IKuhhcQ=
+google.golang.org/api v0.197.0/go.mod h1:AuOuo20GoQ331nq7DquGHlU6d+2wN2fZ8O0ta60nRNw=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto/googleapis/api v0.0.0-20240711142825-46eb208f015d h1:kHjw/5UfflP/L5EbledDrcG4C2597RtymmGRZvHiCuY=
-google.golang.org/genproto/googleapis/api v0.0.0-20240711142825-46eb208f015d/go.mod h1:mw8MG/Qz5wfgYr6VqVCiZcHe/GJEfI+oGGDCohaVgB0=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf h1:liao9UHurZLtiEwBgT9LMOnKYsHze6eA6w1KQCMVN2Q=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY=
+google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 h1:hjSy6tcFQZ171igDaN5QHOw2n6vx40juYbC/x67CEhc=
+google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:qpvKtACPCQhAdu3PyQgV4l3LMXZEtft7y8QcarRsp9I=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
-google.golang.org/grpc v1.64.1 h1:LKtvyfbX3UGVPFcGqJ9ItpVWW6oN/2XqTxfAnwRRXiA=
-google.golang.org/grpc v1.64.1/go.mod h1:hiQF4LFZelK2WKaP6W0L92zGHtiQdZxk8CrSdvyjeP0=
+google.golang.org/grpc v1.66.2 h1:3QdXkuq3Bkh7w+ywLdLvM56cmGvQHUMZpiCzt6Rqaoo=
+google.golang.org/grpc v1.66.2/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -291,8 +305,6 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/gookit/color.v1 v1.1.6 h1:5fB10p6AUFjhd2ayq9JgmJWr9WlTrguFdw3qlYtKNHk=
-gopkg.in/gookit/color.v1 v1.1.6/go.mod h1:IcEkFGaveVShJ+j8ew+jwe9epHyGpJ9IrptHmW3laVY=
 gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
 gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

jina/jina.go

@@ -0,0 +1,70 @@
+package jina
+
+// see https://jina.ai for more information
+
+import (
+	"fmt"
+	"io"
+	"net/http"
+
+	"github.com/danielmiessler/fabric/common"
+)
+
+type Client struct {
+	*common.Configurable
+	ApiKey *common.SetupQuestion
+}
+
+func NewClient() (ret *Client) {
+
+	label := "Jina AI"
+
+	ret = &Client{
+		Configurable: &common.Configurable{
+			Label:         label,
+			EnvNamePrefix: common.BuildEnvVariablePrefix(label),
+		},
+	}
+
+	ret.ApiKey = ret.AddSetupQuestion("API Key", false)
+
+	return
+}
+
+// ScrapeURL return the main content of a webpage in clean, LLM-friendly text.
+func (jc *Client) ScrapeURL(url string) (ret string, err error) {
+	return jc.request(fmt.Sprintf("https://r.jina.ai/%s", url))
+}
+
+func (jc *Client) ScrapeQuestion(question string) (ret string, err error) {
+	return jc.request(fmt.Sprintf("https://s.jina.ai/%s", question))
+}
+
+func (jc *Client) request(requestURL string) (ret string, err error) {
+	var req *http.Request
+	if req, err = http.NewRequest("GET", requestURL, nil); err != nil {
+		err = fmt.Errorf("error creating request: %w", err)
+		return
+	}
+
+	// if api keys exist, set the header
+	if jc.ApiKey.Value != "" {
+		req.Header.Set("Authorization", "Bearer "+jc.ApiKey.Value)
+	}
+
+	client := &http.Client{}
+	var resp *http.Response
+	if resp, err = client.Do(req); err != nil {
+		err = fmt.Errorf("error sending request: %w", err)
+		return
+	}
+	defer resp.Body.Close()
+
+	var body []byte
+	if body, err = io.ReadAll(resp.Body); err != nil {
+		err = fmt.Errorf("error reading response body: %w", err)
+		return
+	}
+	ret = string(body)
+	return
+}

main.go

@@ -2,14 +2,15 @@ package main
 
 import (
 	"fmt"
+	"github.com/jessevdk/go-flags"
 	"os"
 
 	"github.com/danielmiessler/fabric/cli"
 )
 
 func main() {
-	_, err := cli.Cli()
-	if err != nil {
+	err := cli.Cli(version)
+	if err != nil && !flags.WroteHelp(err) {
 		fmt.Printf("%s\n", err)
 		os.Exit(1)
 	}

patterns/agility_story/system.md

@@ -11,11 +11,11 @@ Please write a user story and acceptance criteria for the requested topic.
 Output the results in JSON format as defined in this example:
 
 {
-    "Topic": "Automating data quality automation",
+    "Topic": "Authentication and User Management",
     "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:
+INPUT:

patterns/analyze_military_strategy/system.md

@@ -0,0 +1,29 @@
+# IDENTITY and PURPOSE
+You are a military historian and strategic analyst specializing in dissecting historical battles. Your purpose is to provide comprehensive, insightful analysis of military engagements, focusing on the strategies employed by opposing forces. You excel at comparing and contrasting tactical approaches, identifying key strengths and weaknesses, and presenting this information in a clear, structured format.
+
+# STEPS
+- Summarize the battle in 50 words or less, including the date, location, and main combatants in a section called BATTLE OVERVIEW.
+- Identify and list the primary commanders for each side in a section called COMMANDERS.
+- Analyze and list 10-20 key strategic decisions made by each side in a section called STRATEGIC DECISIONS.
+- Extract 15-30 of the most crucial strengths and weaknesses for each opposing force into a section called STRENGTHS AND WEAKNESSES.
+- Identify and list 10-20 pivotal moments or turning points in the battle in a section called PIVOTAL MOMENTS.
+- Compare and contrast 15-30 tactical approaches used by both sides in a section called TACTICAL COMPARISON.
+- Analyze and list 10-20 logistical factors that influenced the battle's outcome in a section called LOGISTICAL FACTORS.
+- Evaluate the battle's immediate and long-term consequences in 100-150 words in a section called BATTLE CONSEQUENCES.
+- Summarize the most crucial strategic lesson from this battle in a 20-word sentence in a section called KEY STRATEGIC LESSON.
+
+# OUTPUT INSTRUCTIONS
+- Only output in Markdown format.
+- Present the STRENGTHS AND WEAKNESSES and TACTICAL COMPARISON sections in a two-column format, with one side on the left and the other on the right.
+- Write the STRATEGIC DECISIONS bullets as exactly 20 words each.
+- Write the PIVOTAL MOMENTS bullets as exactly 15 words each.
+- Write the LOGISTICAL FACTORS bullets as exactly 15 words each.
+- Extract at least 15 items for each output section unless otherwise specified.
+- Do not give warnings or notes; only output the requested sections.
+- Use bulleted lists for output, not numbered lists.
+- Do not repeat information across different sections.
+- Ensure variety in how bullet points begin; avoid repetitive phrasing.
+- Follow ALL these instructions meticulously when creating your output.
+
+# INPUT
+INPUT:

patterns/extract_core_message/system.md

@@ -0,0 +1,39 @@
+# IDENTITY
+
+You are an expert at looking at a presentation, an essay, or a full body of lifetime work, and clearly and accurately articulating what the core message is.
+
+# GOAL
+
+- Produce a clear sentence that perfectly articulates the core message as presented in a given text or body of work.
+
+# EXAMPLE
+
+If the input is all of Victor Frankl's work, then the core message would be:
+
+Finding meaning in suffering is key to human resilience, purpose, and enduring life’s challenges.
+
+END EXAMPLE
+
+# STEPS
+
+- Fully digest the input. 
+
+- Determine if the input is a single text or a body of work.
+
+- Based on which it is, parse the thing that's supposed to be parsed.
+
+- Extract the core message from the parsed text into a single sentence.
+
+# OUTPUT
+
+- Output a single, 15-word sentence that perfectly articulates the core message as presented in the input.
+
+# OUTPUT INSTRUCTIONS
+
+- The sentence should be a single sentence that is 15 words or fewer, with no special formatting or anything else.
+
+- Do not include any setup to the sentence, e.g., "The core message is to…", etc. Just list the core message and nothing else.
+
+- ONLY OUTPUT THE CORE MESSAGE, not a setup to it, commentary on it, or anything else.
+
+- Do not ask questions or complain in any way about the task.

patterns/extract_most_redeeming_thing/system.md

@@ -0,0 +1,37 @@
+# IDENTITY
+
+You are an expert at looking at an input and extracting the most redeeming thing about them, even if they're mostly horrible.
+
+# GOAL
+
+- Produce the most redeeming thing about the thing given in input.
+
+# EXAMPLE
+
+If the body of work is all of Ted Kazcynski's writings, then the most redeeming thing him would be:
+
+He really stuck to his convictions by living in a cabin in the woods.
+
+END EXAMPLE
+
+# STEPS
+
+- Fully digest the input. 
+
+- Determine if the input is a single text or a body of work.
+
+- Based on which it is, parse the thing that's supposed to be parsed.
+
+- Extract the most redeeming thing with the world from the parsed text into a single sentence.
+
+# OUTPUT
+
+- Output a single, 15-word sentence that perfectly articulates the most redeeming thing with the world as presented in the input.
+
+# OUTPUT INSTRUCTIONS
+
+- The sentence should be a single sentence that is 15 words or fewer, with no special formatting or anything else.
+
+- Do not include any setup to the sentence, e.g., "The most redeeming thing…", etc. Just list the redeeming thing and nothing else.
+
+- Do not ask questions or complain in any way about the task.

patterns/extract_predictions/system.md

@@ -6,7 +6,7 @@ Take a step back and think step-by-step about how to achieve the best possible r
 
 # STEPS
 
-- Extract all predictions made within the content.
+- Extract all predictions made within the content, even if you don't have a full list of the content or the content itself.
 
 - For each prediction, extract the following:
 

patterns/extract_primary_solution/system.md

@@ -0,0 +1,39 @@
+# IDENTITY
+
+You are an expert at looking at a presentation, an essay, or a full body of lifetime work, and clearly and accurately articulating what the author(s) believe is the primary solution for the world.
+
+# GOAL
+
+- Produce a clear sentence that perfectly articulates the primary solution with the world as presented in a given text or body of work.
+
+# EXAMPLE
+
+If the body of work is all of Ted Kazcynski's writings, then the primary solution with the world would be:
+
+Reject all technology and return to a natural, pre-technological state of living.
+
+END EXAMPLE
+
+# STEPS
+
+- Fully digest the input. 
+
+- Determine if the input is a single text or a body of work.
+
+- Based on which it is, parse the thing that's supposed to be parsed.
+
+- Extract the primary solution with the world from the parsed text into a single sentence.
+
+# OUTPUT
+
+- Output a single, 15-word sentence that perfectly articulates the primary solution with the world as presented in the input.
+
+# OUTPUT INSTRUCTIONS
+
+- The sentence should be a single sentence that is 15 words or fewer, with no special formatting or anything else.
+
+- Do not include any setup to the sentence, e.g., "The solution according to…", etc. Just list the problem and nothing else.
+
+- ONLY OUTPUT THE SOLUTION, not a setup to the solution. Or a description of the solution. Just the solution.
+
+- Do not ask questions or complain in any way about the task.

patterns/extract_product_features/system.md

@@ -0,0 +1,31 @@
+# IDENTITY and PURPOSE
+
+You extract the list of product features from the input.
+
+Take a step back and think step-by-step about how to achieve the best possible results by following the steps below.
+
+# STEPS
+
+- Consume the whole input as a whole and think about the type of announcement or content it is.
+
+- Figure out which parts were talking about features of a product or service.
+
+- Output the list of features as a bulleted list of 15 words per bullet.
+
+# OUTPUT INSTRUCTIONS
+
+- Only output Markdown.
+
+- 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/raycast/create_story_explanation

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+# Required parameters:
+# @raycast.schemaVersion 1
+# @raycast.title Create Story Explanation
+# @raycast.mode fullOutput
+
+# Optional parameters:
+# @raycast.icon 🧠
+# @raycast.argument1 { "type": "text", "placeholder": "Input text", "optional": false, "percentEncoded": true}
+
+# Documentation:
+# @raycast.description Run fabric create_story_explanation on the input text
+# @raycast.author Daniel Miessler
+# @raycast.authorURL https://github.com/danielmiessler
+
+# Set PATH to include common locations and $HOME/go/bin
+PATH="/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:$HOME/go/bin:$PATH"
+
+# Use the PATH to find and execute fabric
+if command -v fabric >/dev/null 2>&1; then
+    fabric -sp create_story_explanation "${1}"
+else
+    echo "Error: fabric command not found in PATH"
+    echo "Current PATH: $PATH"
+    exit 1
+fi

patterns/raycast/extract_primary_problem

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+# Required parameters:
+# @raycast.schemaVersion 1
+# @raycast.title Extract Primary Problem
+# @raycast.mode fullOutput
+
+# Optional parameters:
+# @raycast.icon 🧠
+# @raycast.argument1 { "type": "text", "placeholder": "Input text", "optional": false, "percentEncoded": true}
+
+# Documentation:
+# @raycast.description Run fabric extract_primary_problem on the input text
+# @raycast.author Daniel Miessler
+# @raycast.authorURL https://github.com/danielmiessler
+
+# Set PATH to include common locations and $HOME/go/bin
+PATH="/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:$HOME/go/bin:$PATH"
+
+# Use the PATH to find and execute fabric
+if command -v fabric >/dev/null 2>&1; then
+    fabric -sp extract_primary_problem "${1}"
+else
+    echo "Error: fabric command not found in PATH"
+    echo "Current PATH: $PATH"
+    exit 1
+fi

patterns/solve_with_cot/system.md

@@ -1,24 +1,35 @@
 # IDENTITY 
 
-You are an AI assistant designed to provide detailed, step-by-step responses.
+You are an AI assistant designed to provide detailed, step-by-step responses. Your outputs should follow this structure:
 
 # STEPS
 
 1. Begin with a <thinking> section.
+
 2. Inside the thinking section:
-a. Briefly analyze the question and outline your approach.
-b. Present a clear plan of steps to solve the problem.
-c. Use a "Chain of Thought" reasoning process if necessary, breaking down y
-3. Include a reflection> section for each idea where you:
-a. Review your reasoning.
-b. Check for potential errors or oversights.
-c. Confirm or adjust your conclusion if necessary.
-4. Be sure to close all reflection sections.
-5. Close the thinking section with </thinking>.
-6. Provide your final answer in an ‹output> section.
-Always use these tags in your responses. Be thorough in your explanations, sho
-Remember: Both <thinking> and < reflection> MUST be tags and must be closed at
-Make sure all ‹tags> are on separate lines with no other text. 
+
+- a. Briefly analyze the question and outline your approach.
+
+- b. Present a clear plan of steps to solve the problem.
+
+- c. Use a "Chain of Thought" reasoning process if necessary, breaking down your thought process into numbered steps.
+
+3. Include a <reflection> section for each idea where you:
+
+- a. Review your reasoning.
+
+- b. Check for potential errors or oversights.
+
+- c. Confirm or adjust your conclusion if necessary.
+  - Be sure to close all reflection sections.
+  - Close the thinking section with </thinking>.
+  - Provide your final answer in an <output> section.
+
+Always use these tags in your responses. Be thorough in your explanations, showing each step of your reasoning process. 
+Aim to be precise and logical in your approach, and don't hesitate to break down complex problems into simpler components. 
+Your tone should be analytical and slightly formal, focusing on clear communication of your thought process.
+Remember: Both <thinking> and <reflection> MUST be tags and must be closed at their conclusion.
+Make sure all <tags> are on separate lines with no other text. 
 
 # INPUT
 

patterns/transcribe_minutes/system.md

@@ -8,32 +8,32 @@ Take a step back and think step-by-step about how to achieve the best possible r
 
 - Fully digest the content provided.
 
-- Extract all actionables agreed within the meeting.
+- Extract all actionables agreed upon within the meeting.
 
 - Extract any interesting ideas brought up in the meeting. 
 
-- In a section called TITLE, write a 1 to 5 word title for the meeting
+- In a section called TITLE, write a 1 to 5 word title for the meeting.
 
 - In a section called MAIN IDEA, write a 15-word sentence that captures the main idea.
 
-- In a section called MINUTES, 20 to 50 bullet points, tracking the conversation, highliting  of the most surprising, insightful, and/or interesting ideas that come up. If there are less than 50 then collect all of them. Make sure you extract at least 20.
+- In a section called MINUTES, write 20 to 50 bullet points, highlighting of the most surprising, insightful, and/or interesting ideas that come up in the conversation. If there are less than 50 then collect all of them. Make sure you extract at least 20.
 
-- In a section called ACTIONABLES, write bullet points for ALL agreed actionable details. This includes and case where a speaker agrees to do, or look into something. If there is a deadline mentioned, include it here.
+- In a section called ACTIONABLES, write bullet points for ALL agreed actionable details. This includes cases where a speaker agrees to do or look into something. If there is a deadline mentioned, include it here.
 
-- In a section called DECISIONS: In bullet points, include all decisions made during the meeting, including the rationale behind each decision.
+- In a section called DECISIONS, include all decisions made during the meeting, including the rationale behind each decision. Present them as bullet points.
 
-- In a section called CHALLENGES: Identify and document any challenges or issues discussed during the meeting. Note any potential solutions or strategies proposed to address these challenges
+- In a section called CHALLENGES, identify and document any challenges or issues discussed during the meeting. Note any potential solutions or strategies proposed to address these challenges.
 
-- In a section caled NEXT STEPS, Outline the next steps and action plan to be taken after the meeting
+- In a section called NEXT STEPS, outline the next steps and actions to be taken after the meeting.
 
 # OUTPUT INSTRUCTIONS
 
 - Only output Markdown.
-- Write MINUTE bullets as exxactly 15 words
-- Write ACTIONABLES as exactly 15 words
-- Write DECISIONS as exactly 15 words
-- Write CHALLENFE as 2-3 sentences.
-- Write NEXT STEP a 2-3 sentences
+- Write MINUTES as exactly 15 words.
+- Write ACTIONABLES as exactly 15 words.
+- Write DECISIONS as exactly 15 words.
+- Write CHALLENGES as 2-3 sentences.
+- Write NEXT STEPS as 2-3 sentences.
 - Do not give warnings or notes; only output the requested sections.
 - Do not repeat ideas, quotes, facts, or resources.
 - You use bulleted lists for output, not numbered lists.
@@ -42,4 +42,4 @@ Take a step back and think step-by-step about how to achieve the best possible r
 
 # INPUT
 
-INPUT:
+INPUT:

vendors/anthropic/anthropic.go

@@ -4,11 +4,14 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	goopenai "github.com/sashabaranov/go-openai"
 
 	"github.com/danielmiessler/fabric/common"
 	"github.com/liushuangls/go-anthropic/v2"
 )
 
+const baseUrl = "https://api.anthropic.com/v1"
+
 func NewClient() (ret *Client) {
 	vendorName := "Anthropic"
 	ret = &Client{}
@@ -19,15 +22,17 @@ func NewClient() (ret *Client) {
 		ConfigureCustom: ret.configure,
 	}
 
+	ret.ApiBaseURL = ret.AddSetupQuestion("API Base URL", false)
+	ret.ApiBaseURL.Value = baseUrl
 	ret.ApiKey = ret.Configurable.AddSetupQuestion("API key", true)
 
 	// we could provide a setup question for the following settings
 	ret.maxTokens = 4096
 	ret.defaultRequiredUserMessage = "Hi"
 	ret.models = []string{
-		anthropic.ModelClaude3Haiku20240307, anthropic.ModelClaude3Opus20240229,
-		anthropic.ModelClaude3Opus20240229, anthropic.ModelClaude2Dot0, anthropic.ModelClaude2Dot1,
-		anthropic.ModelClaudeInstant1Dot2, "claude-3-5-sonnet-20240620",
+		string(anthropic.ModelClaude3Haiku20240307), string(anthropic.ModelClaude3Opus20240229),
+		string(anthropic.ModelClaude3Opus20240229), string(anthropic.ModelClaude2Dot0), string(anthropic.ModelClaude2Dot1),
+		string(anthropic.ModelClaudeInstant1Dot2), "claude-3-5-sonnet-20240620",
 	}
 
 	return
@@ -35,7 +40,8 @@ func NewClient() (ret *Client) {
 
 type Client struct {
 	*common.Configurable
-	ApiKey *common.SetupQuestion
+	ApiBaseURL *common.SetupQuestion
+	ApiKey     *common.SetupQuestion
 
 	maxTokens                  int
 	defaultRequiredUserMessage string
@@ -45,7 +51,11 @@ type Client struct {
 }
 
 func (an *Client) configure() (err error) {
-	an.client = anthropic.NewClient(an.ApiKey.Value)
+	if an.ApiBaseURL.Value != "" {
+		an.client = anthropic.NewClient(an.ApiKey.Value, anthropic.WithBaseURL(an.ApiBaseURL.Value))
+	} else {
+		an.client = anthropic.NewClient(an.ApiKey.Value)
+	}
 	return
 }
 
@@ -104,7 +114,7 @@ func (an *Client) buildMessagesRequest(msgs []*common.Message, opts *common.Chat
 	messages := an.toMessages(msgs)
 
 	ret = anthropic.MessagesRequest{
-		Model:       opts.Model,
+		Model:       anthropic.Model(opts.Model),
 		Temperature: &temperature,
 		TopP:        &topP,
 		Messages:    messages,
@@ -121,10 +131,8 @@ func (an *Client) toMessages(msgs []*common.Message) (ret []anthropic.Message) {
 	for _, msg := range normalizedMessages {
 		var message anthropic.Message
 		switch msg.Role {
-		case "user":
+		case goopenai.ChatMessageRoleUser:
 			message = anthropic.NewUserTextMessage(msg.Content)
-		case "system":
-			message = anthropic.NewAssistantTextMessage(msg.Content)
 		default:
 			message = anthropic.NewAssistantTextMessage(msg.Content)
 		}

vendors/dryrun/dryrun.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	goopenai "github.com/sashabaranov/go-openai"
 
 	"github.com/danielmiessler/fabric/common"
 )
@@ -35,9 +36,11 @@ func (c *Client) SendStream(msgs []*common.Message, opts *common.ChatOptions, ch
 
 	for _, msg := range msgs {
 		switch msg.Role {
-		case "system":
+		case goopenai.ChatMessageRoleSystem:
 			output += fmt.Sprintf("System:\n%s\n\n", msg.Content)
-		case "user":
+		case goopenai.ChatMessageRoleAssistant:
+			output += fmt.Sprintf("Assistant:\n%s\n\n", msg.Content)
+		case goopenai.ChatMessageRoleUser:
 			output += fmt.Sprintf("User:\n%s\n\n", msg.Content)
 		default:
 			output += fmt.Sprintf("%s:\n%s\n\n", msg.Role, msg.Content)
@@ -56,14 +59,16 @@ func (c *Client) SendStream(msgs []*common.Message, opts *common.ChatOptions, ch
 	return nil
 }
 
-func (c *Client) Send(ctx context.Context, msgs []*common.Message, opts *common.ChatOptions) (string, error) {
+func (c *Client) Send(_ context.Context, msgs []*common.Message, opts *common.ChatOptions) (string, error) {
 	fmt.Println("Dry run: Would send the following request:")
 
 	for _, msg := range msgs {
 		switch msg.Role {
-		case "system":
+		case goopenai.ChatMessageRoleSystem:
 			fmt.Printf("System:\n%s\n\n", msg.Content)
-		case "user":
+		case goopenai.ChatMessageRoleAssistant:
+			fmt.Printf("Assistant:\n%s\n\n", msg.Content)
+		case goopenai.ChatMessageRoleUser:
 			fmt.Printf("User:\n%s\n\n", msg.Content)
 		default:
 			fmt.Printf("%s:\n%s\n\n", msg.Role, msg.Content)
@@ -84,6 +89,6 @@ func (c *Client) Setup() error {
 	return nil
 }
 
-func (c *Client) SetupFillEnvFileContent(buffer *bytes.Buffer) {
+func (c *Client) SetupFillEnvFileContent(_ *bytes.Buffer) {
 	// No environment variables needed for dry run
 }

vendors/mistral/mistral.go

@@ -0,0 +1,15 @@
+package mistral
+
+import (
+	"github.com/danielmiessler/fabric/vendors/openai"
+)
+
+func NewClient() (ret *Client) {
+	ret = &Client{}
+	ret.Client = openai.NewClientCompatible("Mistral", "https://api.mistral.ai/v1", nil)
+	return
+}
+
+type Client struct {
+	*openai.Client
+}

vendors/openai/openai.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"log/slog"
 
 	"github.com/danielmiessler/fabric/common"
 	"github.com/samber/lo"
@@ -82,7 +83,13 @@ func (o *Client) SendStream(
 	for {
 		var response openai.ChatCompletionStreamResponse
 		if response, err = stream.Recv(); err == nil {
-			channel <- response.Choices[0].Delta.Content
+			if len(response.Choices) > 0 {
+				channel <- response.Choices[0].Delta.Content
+			} else {
+				channel <- "\n"
+				close(channel)
+				break
+			}
 		} else if errors.Is(err, io.EOF) {
 			channel <- "\n"
 			close(channel)
@@ -103,7 +110,10 @@ func (o *Client) Send(ctx context.Context, msgs []*common.Message, opts *common.
 	if resp, err = o.ApiClient.CreateChatCompletion(ctx, req); err != nil {
 		return
 	}
-	ret = resp.Choices[0].Message.Content
+	if len(resp.Choices) > 0 {
+		ret = resp.Choices[0].Message.Content
+		slog.Debug("SystemFingerprint: " + resp.SystemFingerprint)
+	}
 	return
 }
 
@@ -111,26 +121,35 @@ func (o *Client) buildChatCompletionRequest(
 	msgs []*common.Message, opts *common.ChatOptions,
 ) (ret goopenai.ChatCompletionRequest) {
 	messages := lo.Map(msgs, func(message *common.Message, _ int) goopenai.ChatCompletionMessage {
-		var role string
-
-		switch message.Role {
-		case "user":
-			role = goopenai.ChatMessageRoleUser
-		case "system":
-			role = goopenai.ChatMessageRoleSystem
-		default:
-			role = goopenai.ChatMessageRoleSystem
-		}
-		return goopenai.ChatCompletionMessage{Role: role, Content: message.Content}
+		return goopenai.ChatCompletionMessage{Role: message.Role, Content: message.Content}
 	})
 
-	ret = goopenai.ChatCompletionRequest{
-		Model:            opts.Model,
-		Temperature:      float32(opts.Temperature),
-		TopP:             float32(opts.TopP),
-		PresencePenalty:  float32(opts.PresencePenalty),
-		FrequencyPenalty: float32(opts.FrequencyPenalty),
-		Messages:         messages,
+	if opts.Raw {
+		ret = goopenai.ChatCompletionRequest{
+			Model:    opts.Model,
+			Messages: messages,
+		}
+	} else {
+		if opts.Seed == 0 {
+			ret = goopenai.ChatCompletionRequest{
+				Model:            opts.Model,
+				Temperature:      float32(opts.Temperature),
+				TopP:             float32(opts.TopP),
+				PresencePenalty:  float32(opts.PresencePenalty),
+				FrequencyPenalty: float32(opts.FrequencyPenalty),
+				Messages:         messages,
+			}
+		} else {
+			ret = goopenai.ChatCompletionRequest{
+				Model:            opts.Model,
+				Temperature:      float32(opts.Temperature),
+				TopP:             float32(opts.TopP),
+				PresencePenalty:  float32(opts.PresencePenalty),
+				FrequencyPenalty: float32(opts.FrequencyPenalty),
+				Messages:         messages,
+				Seed:             &opts.Seed,
+			}
+		}
 	}
 	return
 }

vendors/openai/openai_test.go

@@ -0,0 +1,102 @@
+package openai
+
+import (
+	"testing"
+
+	"github.com/danielmiessler/fabric/common"
+	"github.com/sashabaranov/go-openai"
+	goopenai "github.com/sashabaranov/go-openai"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestBuildChatCompletionRequestPinSeed(t *testing.T) {
+
+	var msgs []*common.Message
+
+	for i := 0; i < 2; i++ {
+		msgs = append(msgs, &common.Message{
+			Role:    "User",
+			Content: "My msg",
+		})
+	}
+
+	opts := &common.ChatOptions{
+		Temperature:      0.8,
+		TopP:             0.9,
+		PresencePenalty:  0.1,
+		FrequencyPenalty: 0.2,
+		Raw:              false,
+		Seed:             1,
+	}
+
+	var expectedMessages []openai.ChatCompletionMessage
+
+	for i := 0; i < 2; i++ {
+		expectedMessages = append(expectedMessages,
+			openai.ChatCompletionMessage{
+				Role:    msgs[i].Role,
+				Content: msgs[i].Content,
+			},
+		)
+	}
+
+	var expectedRequest = goopenai.ChatCompletionRequest{
+		Model:            opts.Model,
+		Temperature:      float32(opts.Temperature),
+		TopP:             float32(opts.TopP),
+		PresencePenalty:  float32(opts.PresencePenalty),
+		FrequencyPenalty: float32(opts.FrequencyPenalty),
+		Messages:         expectedMessages,
+		Seed:             &opts.Seed,
+	}
+
+	var client = NewClient()
+	request := client.buildChatCompletionRequest(msgs, opts)
+	assert.Equal(t, expectedRequest, request)
+}
+
+func TestBuildChatCompletionRequestNilSeed(t *testing.T) {
+
+	var msgs []*common.Message
+
+	for i := 0; i < 2; i++ {
+		msgs = append(msgs, &common.Message{
+			Role:    "User",
+			Content: "My msg",
+		})
+	}
+
+	opts := &common.ChatOptions{
+		Temperature:      0.8,
+		TopP:             0.9,
+		PresencePenalty:  0.1,
+		FrequencyPenalty: 0.2,
+		Raw:              false,
+		Seed:             0,
+	}
+
+	var expectedMessages []openai.ChatCompletionMessage
+
+	for i := 0; i < 2; i++ {
+		expectedMessages = append(expectedMessages,
+			openai.ChatCompletionMessage{
+				Role:    msgs[i].Role,
+				Content: msgs[i].Content,
+			},
+		)
+	}
+
+	var expectedRequest = goopenai.ChatCompletionRequest{
+		Model:            opts.Model,
+		Temperature:      float32(opts.Temperature),
+		TopP:             float32(opts.TopP),
+		PresencePenalty:  float32(opts.PresencePenalty),
+		FrequencyPenalty: float32(opts.FrequencyPenalty),
+		Messages:         expectedMessages,
+		Seed:             nil,
+	}
+
+	var client = NewClient()
+	request := client.buildChatCompletionRequest(msgs, opts)
+	assert.Equal(t, expectedRequest, request)
+}

version.go

@@ -0,0 +1,3 @@
+package main
+
+var version = "v1.4.54"

youtube/youtube.go

@@ -10,6 +10,7 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/youtube/v3"
 	"log"
+	"net/url"
 	"regexp"
 	"strconv"
 	"strings"
@@ -61,17 +62,17 @@ func (o *YouTube) GetVideoId(url string) (ret string, err error) {
 	return
 }
 
-func (o *YouTube) GrabTranscriptForUrl(url string) (ret string, err error) {
+func (o *YouTube) GrabTranscriptForUrl(url string, language string) (ret string, err error) {
 	var videoId string
 	if videoId, err = o.GetVideoId(url); err != nil {
 		return
 	}
-	return o.GrabTranscript(videoId)
+	return o.GrabTranscript(videoId, language)
 }
 
-func (o *YouTube) GrabTranscript(videoId string) (ret string, err error) {
+func (o *YouTube) GrabTranscript(videoId string, language string) (ret string, err error) {
 	var transcript string
-	if transcript, err = o.GrabTranscriptBase(videoId); err != nil {
+	if transcript, err = o.GrabTranscriptBase(videoId, language); err != nil {
 		err = fmt.Errorf("transcript not available. (%v)", err)
 		return
 	}
@@ -89,14 +90,14 @@ func (o *YouTube) GrabTranscript(videoId string) (ret string, err error) {
 	return
 }
 
-func (o *YouTube) GrabTranscriptBase(videoId string) (ret string, err error) {
+func (o *YouTube) GrabTranscriptBase(videoId string, language string) (ret string, err error) {
 	if err = o.initService(); err != nil {
 		return
 	}
 
-	url := "https://www.youtube.com/watch?v=" + videoId
+	watchUrl := "https://www.youtube.com/watch?v=" + videoId
 	var resp string
-	if resp, err = soup.Get(url); err != nil {
+	if resp, err = soup.Get(watchUrl); err != nil {
 		return
 	}
 
@@ -117,6 +118,16 @@ func (o *YouTube) GrabTranscriptBase(videoId string) (ret string, err error) {
 
 				if len(captionTracks) > 0 {
 					transcriptURL := captionTracks[0].BaseURL
+					for _, captionTrack := range captionTracks {
+						parsedUrl, error := url.Parse(captionTrack.BaseURL)
+						if error != nil {
+							err = fmt.Errorf("error parsing caption track")
+						}
+						parsedUrlParams, _ := url.ParseQuery(parsedUrl.RawQuery)
+						if parsedUrlParams["lang"][0] == language {
+							transcriptURL = captionTrack.BaseURL
+						}
+					}
 					ret, err = soup.Get(transcriptURL)
 					return
 				}
@@ -212,7 +223,7 @@ func (o *YouTube) Grab(url string, options *Options) (ret *VideoInfo, err error)
 	}
 
 	if options.Transcript {
-		if ret.Transcript, err = o.GrabTranscript(videoId); err != nil {
+		if ret.Transcript, err = o.GrabTranscript(videoId, "en"); err != nil {
 			return
 		}
 	}