Update version to v1.4.86 and commit

Merge pull request #1088 from jaredmontoya/fix-ollama-context-length
feat: add DEFAULT_CONTEXT_LENGTH setting
2026-01-09 22:38:10 -05:00 · 2024-10-30 15:59:31 +00:00 · 2024-10-30 16:59:13 +01:00 · 2024-10-30 15:36:01 +01:00 · 2024-10-30 12:51:09 +00:00 · 2024-10-30 13:50:52 +01:00
16 changed files with 166 additions and 108 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,8 +3,14 @@ name: Go Build
 on:
  push:
    branches: ["main"]
+    paths-ignore:
+      - 'patterns/**'
+      - '**/*.md'
  pull_request:
    branches: ["main"]
+    paths-ignore:
+      - 'patterns/**'
+      - '**/*.md'

 jobs:
  test:
--- a/.github/workflows/update-version-and-create-tag.yml
+++ b/.github/workflows/update-version-and-create-tag.yml
@@ -4,6 +4,9 @@ on:
  push:
    branches:
      - main  # Monitor the main branch
+    paths-ignore:
+      - 'patterns/**'
+      - '**/*.md'

 permissions:
  contents: write  # Ensure the workflow has write permissions
--- a/README.md
+++ b/README.md
@@ -197,7 +197,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 -ldflags "-X main.version=$(git describe --tags --always)" github.com/danielmiessler/fabric@latest
+go install github.com/danielmiessler/fabric@latest
 ```

 ## Usage
@@ -217,7 +217,7 @@ Application Options:
  -v, --variable=            Values for pattern variables, e.g. -v=#role:expert -v=#points:30"
  -C, --context=             Choose a context from the available contexts
      --session=             Choose a session from the available sessions
-  -a, --attachment=         Attachment path or URL (e.g. for OpenAI image recognition messages)
+  -a, --attachment=          Attachment path or URL (e.g. for OpenAI image recognition messages)
  -S, --setup                Run setup for all reconfigurable parts of fabric
  -t, --temperature=         Set temperature (default: 0.7)
  -T, --topp=                Set top P (default: 0.9)
--- a/cli/cli.go
+++ b/cli/cli.go
@@ -2,16 +2,17 @@ package cli

 import (
 	"fmt"
+	"os"
+	"path/filepath"
+	"strconv"
+	"strings"
+
 	"github.com/danielmiessler/fabric/common"
 	"github.com/danielmiessler/fabric/core"
 	"github.com/danielmiessler/fabric/plugins/ai"
 	"github.com/danielmiessler/fabric/plugins/db/fsdb"
 	"github.com/danielmiessler/fabric/plugins/tools/converter"
 	"github.com/danielmiessler/fabric/restapi"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
 )

 // Cli Controls the cli. It takes in the flags and runs the appropriate functions
@@ -175,8 +176,7 @@ func Cli(version string) (err error) {
 		}

 		if !currentFlags.IsChatRequest() {
-			// if the pattern flag is not set, we wanted only to grab the transcript or comments
-			fmt.Println(messageTools)
+			err = currentFlags.WriteOutput(messageTools)
 			return
 		}
 	}
@@ -202,8 +202,7 @@ func Cli(version string) (err error) {
 		}

 		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(messageTools)
+			err = currentFlags.WriteOutput(messageTools)
 			return
 		}
 	}
@@ -213,7 +212,7 @@ func Cli(version string) (err error) {
 	}

 	var chatter *core.Chatter
-	if chatter, err = registry.GetChatter(currentFlags.Model, currentFlags.Stream, currentFlags.DryRun); err != nil {
+	if chatter, err = registry.GetChatter(currentFlags.Model, currentFlags.ModelContextLength, currentFlags.Stream, currentFlags.DryRun); err != nil {
 		return
 	}

--- a/cli/flags.go
+++ b/cli/flags.go
@@ -4,14 +4,15 @@ import (
 	"bufio"
 	"errors"
 	"fmt"
-	goopenai "github.com/sashabaranov/go-openai"
 	"io"
 	"os"
 	"strings"

-	"github.com/danielmiessler/fabric/common"
 	"github.com/jessevdk/go-flags"
+	goopenai "github.com/sashabaranov/go-openai"
 	"golang.org/x/text/language"
+
+	"github.com/danielmiessler/fabric/common"
 )

 // Flags create flags struct. the users flags go into this, this will be passed to the chat struct in cli
@@ -36,6 +37,7 @@ type Flags struct {
 	Message            string            `hidden:"true" description:"Messages to send to chat"`
 	Copy               bool              `short:"c" long:"copy" description:"Copy to clipboard"`
 	Model              string            `short:"m" long:"model" description:"Choose model"`
+	ModelContextLength int               `long:"modelContextLength" description:"Model context length (only affects ollama)"`
 	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"`
@@ -106,12 +108,13 @@ func readStdin() (string, error) {

 func (o *Flags) BuildChatOptions() (ret *common.ChatOptions) {
 	ret = &common.ChatOptions{
-		Temperature:      o.Temperature,
-		TopP:             o.TopP,
-		PresencePenalty:  o.PresencePenalty,
-		FrequencyPenalty: o.FrequencyPenalty,
-		Raw:              o.Raw,
-		Seed:             o.Seed,
+		Temperature:        o.Temperature,
+		TopP:               o.TopP,
+		PresencePenalty:    o.PresencePenalty,
+		FrequencyPenalty:   o.FrequencyPenalty,
+		Raw:                o.Raw,
+		Seed:               o.Seed,
+		ModelContextLength: o.ModelContextLength,
 	}
 	return
 }
@@ -191,6 +194,14 @@ func (o *Flags) IsChatRequest() (ret bool) {
 	return
 }

+func (o *Flags) WriteOutput(message string) (err error) {
+	fmt.Println(message)
+	if o.Output != "" {
+		err = CreateOutputFile(message, o.Output)
+	}
+	return
+}
+
 func AppendMessage(message string, newMessage string) (ret string) {
 	if message != "" {
 		ret = message + "\n" + newMessage
--- a/cli/output.go
+++ b/cli/output.go
@@ -22,6 +22,8 @@ func CreateOutputFile(message string, fileName string) (err error) {
 	defer file.Close()
 	if _, err = file.WriteString(message); err != nil {
 		err = fmt.Errorf("error writing to file: %v", err)
+	} else {
+		fmt.Printf("\n\n... written to %s\n", fileName)
 	}
 	return
 }
--- a/common/domain.go
+++ b/common/domain.go
@@ -15,13 +15,14 @@ type ChatRequest struct {
 }

 type ChatOptions struct {
-	Model            string
-	Temperature      float64
-	TopP             float64
-	PresencePenalty  float64
-	FrequencyPenalty float64
-	Raw              bool
-	Seed             int
+	Model              string
+	Temperature        float64
+	TopP               float64
+	PresencePenalty    float64
+	FrequencyPenalty   float64
+	Raw                bool
+	Seed               int
+	ModelContextLength int
 }

 // NormalizeMessages remove empty messages and ensure messages order user-assist-user
--- a/core/chatter.go
+++ b/core/chatter.go
@@ -3,11 +3,13 @@ package core
 import (
 	"context"
 	"fmt"
+	"strings"
+
+	goopenai "github.com/sashabaranov/go-openai"
+
 	"github.com/danielmiessler/fabric/common"
 	"github.com/danielmiessler/fabric/plugins/ai"
 	"github.com/danielmiessler/fabric/plugins/db/fsdb"
-	goopenai "github.com/sashabaranov/go-openai"
-	"strings"
 )

 const NoSessionPatternUserMessages = "no session, pattern or user messages provided"
@@ -18,8 +20,9 @@ type Chatter struct {
 	Stream bool
 	DryRun bool

-	model  string
-	vendor ai.Vendor
+	model              string
+	modelContextLength int
+	vendor             ai.Vendor
 }

 func (o *Chatter) Send(request *common.ChatRequest, opts *common.ChatOptions) (session *fsdb.Session, err error) {
@@ -31,6 +34,10 @@ func (o *Chatter) Send(request *common.ChatRequest, opts *common.ChatOptions) (s
 		opts.Model = o.model
 	}

+	if opts.ModelContextLength == 0 {
+		opts.ModelContextLength = o.modelContextLength
+	}
+
 	message := ""

 	if o.Stream {
--- a/core/plugin_registry.go
+++ b/core/plugin_registry.go
@@ -3,15 +3,15 @@ package core
 import (
 	"bytes"
 	"fmt"
-	"github.com/danielmiessler/fabric/common"
-	"github.com/danielmiessler/fabric/plugins/ai/azure"
-	"github.com/danielmiessler/fabric/plugins/tools"
-	"github.com/samber/lo"
 	"strconv"

+	"github.com/samber/lo"
+
+	"github.com/danielmiessler/fabric/common"
 	"github.com/danielmiessler/fabric/plugins"
 	"github.com/danielmiessler/fabric/plugins/ai"
 	"github.com/danielmiessler/fabric/plugins/ai/anthropic"
+	"github.com/danielmiessler/fabric/plugins/ai/azure"
 	"github.com/danielmiessler/fabric/plugins/ai/dryrun"
 	"github.com/danielmiessler/fabric/plugins/ai/gemini"
 	"github.com/danielmiessler/fabric/plugins/ai/groq"
@@ -21,6 +21,7 @@ import (
 	"github.com/danielmiessler/fabric/plugins/ai/openrouter"
 	"github.com/danielmiessler/fabric/plugins/ai/siliconcloud"
 	"github.com/danielmiessler/fabric/plugins/db/fsdb"
+	"github.com/danielmiessler/fabric/plugins/tools"
 	"github.com/danielmiessler/fabric/plugins/tools/jina"
 	"github.com/danielmiessler/fabric/plugins/tools/lang"
 	"github.com/danielmiessler/fabric/plugins/tools/youtube"
@@ -164,7 +165,7 @@ func (o *PluginRegistry) Configure() (err error) {
 	return
 }

-func (o *PluginRegistry) GetChatter(model string, stream bool, dryRun bool) (ret *Chatter, err error) {
+func (o *PluginRegistry) GetChatter(model string, modelContextLength int, stream bool, dryRun bool) (ret *Chatter, err error) {
 	ret = &Chatter{
 		db:     o.Db,
 		Stream: stream,
@@ -172,9 +173,20 @@ func (o *PluginRegistry) GetChatter(model string, stream bool, dryRun bool) (ret
 	}

 	defaultModel := o.Defaults.Model.Value
+	defaultModelContextLength, err := strconv.Atoi(o.Defaults.ModelContextLength.Value)
 	defaultVendor := o.Defaults.Vendor.Value
 	vendorManager := o.VendorManager

+	if err != nil {
+		defaultModelContextLength = 0
+		err = nil
+	}
+
+	ret.modelContextLength = modelContextLength
+	if ret.modelContextLength == 0 {
+		ret.modelContextLength = defaultModelContextLength
+	}
+
 	if dryRun {
 		ret.vendor = dryrun.NewClient()
 		ret.model = model
--- a/flake.nix
+++ b/flake.nix
@@ -83,7 +83,7 @@
        {
          fabric = gomod2nix.legacyPackages.${system}.buildGoApplication {
            pname = "fabric-ai";
-            version = "1.4.72";
+            version = "1.4.85";
            src = self;
            pwd = self;
            modules = ./gomod2nix.toml;
--- a/gomod2nix.toml
+++ b/gomod2nix.toml
@@ -2,23 +2,23 @@ schema = 3

 [mod]
  [mod."cloud.google.com/go"]
-    version = "v0.115.1"
-    hash = "sha256-i/KvDIs1/6HoX8DbH0qI2vJ0kiuZOV3o2ep9FxUQn/M="
+    version = "v0.116.0"
+    hash = "sha256-e62GvNveg3bRi4O+eBARqgQ2sinobx+SVGR9WE7jKgs="
  [mod."cloud.google.com/go/ai"]
    version = "v0.8.2"
    hash = "sha256-UtCuHChDsXlACXdlVSNFo8F/X8vAkmPoJyng3/oEFe0="
  [mod."cloud.google.com/go/auth"]
-    version = "v0.9.4"
-    hash = "sha256-ARAms3a9zZepUY5qPcXYFj6XQnFnKRBr0SnSanbkSP0="
+    version = "v0.9.9"
+    hash = "sha256-kUrulQhYPM6cFhInFqTX/Dj1GVi+Ev1Ry7T+hiTmb38="
  [mod."cloud.google.com/go/auth/oauth2adapt"]
    version = "v0.2.4"
    hash = "sha256-GRXPQMHEEgeKhdCOBjoDL7+UW3yBdSei5ULuZGBE4tw="
  [mod."cloud.google.com/go/compute/metadata"]
-    version = "v0.5.1"
-    hash = "sha256-dle3Sv1HUCtEw5OGVnE20RBP3CW4vARxWywU0HZUZ5Y="
+    version = "v0.5.2"
+    hash = "sha256-EtBj20lhjM3SJVKCp70GHMnsItwJ9gOyJOW91wugojc="
  [mod."cloud.google.com/go/longrunning"]
-    version = "v0.6.1"
-    hash = "sha256-4gCfztD2PYAbVW+D4s6KblxksM3uQvWjPTJVkT9Hsz8="
+    version = "v0.6.2"
+    hash = "sha256-X78JL1/YtXA7upOcTuNezq5TxjQyFxQ6OINrS8zzdEU="
  [mod."dario.cat/mergo"]
    version = "v1.0.1"
    hash = "sha256-wcG6+x0k6KzOSlaPA+1RFxa06/RIAePJTAjjuhLbImw="
@@ -41,14 +41,14 @@ schema = 3
    version = "v0.1.4"
    hash = "sha256-ZZ7U5X0gWOu8zcjZcWbcpzGOGdycwq0TjTFh/eZHjXk="
  [mod."github.com/bytedance/sonic"]
-    version = "v1.11.6"
-    hash = "sha256-oGDdBbAHDwQYFFcg3AeYaHwOGQNa1q4n/0w4y2eqsxk="
+    version = "v1.12.3"
+    hash = "sha256-cZicMhM/2D7HefuJ0xe7AJKh9du2O38HWs+3RNCpbZM="
  [mod."github.com/bytedance/sonic/loader"]
-    version = "v0.1.1"
-    hash = "sha256-9MzO8LYUrun40uXTexcbKtQO1MvXhlD6Er6T6v9TOtE="
+    version = "v0.2.1"
+    hash = "sha256-+gPRZtBOJbAnXp/jdMlPmesc62JGH8akQ1UK9VRI7E4="
  [mod."github.com/cloudflare/circl"]
-    version = "v1.4.0"
-    hash = "sha256-poZpasVFbhYsWhaPfss/BzM89S8PvKYz3Nry2qUCre8="
+    version = "v1.5.0"
+    hash = "sha256-j7T4cfbfmhlbaO+kNKveTnk95JbkEOX0IVw8D9bGTkQ="
  [mod."github.com/cloudwego/base64x"]
    version = "v0.1.4"
    hash = "sha256-umCZR3iNmHFm+BC76kfpdcRG+pTQd6Jcu/c2kQDnyfw="
@@ -56,8 +56,8 @@ schema = 3
    version = "v0.2.0"
    hash = "sha256-TzIP2N3HOesXrKACsRr/ShcoqttwPGZPckIepsTyHOA="
  [mod."github.com/cyphar/filepath-securejoin"]
-    version = "v0.3.2"
-    hash = "sha256-YpuNjTSi56x7sdSSt0fui/erxIG3fE5PhLzZ72ColIE="
+    version = "v0.3.4"
+    hash = "sha256-I9dV5gtKk3hH39taAWxvvJEXMi4YoHSxeESVyjpl1MU="
  [mod."github.com/davecgh/go-spew"]
    version = "v1.1.1"
    hash = "sha256-nhzSUrE1fCkN0+RL04N4h8jWmRFPPPWbCuDc7Ss0akI="
@@ -68,8 +68,8 @@ schema = 3
    version = "v1.0.4"
    hash = "sha256-c1JKoRSndwwOyOxq9ddCe+8qn7mG9uRq2o/822x5O/c="
  [mod."github.com/gabriel-vasile/mimetype"]
-    version = "v1.4.3"
-    hash = "sha256-EDmlRi3av27dq/ISVTglv08z4yZzMQ/SxL1c46EJro0="
+    version = "v1.4.6"
+    hash = "sha256-W/uPcE22Fduw1XmX8Ujf1S9SYVOcEoE1wzK4I0/vapw="
  [mod."github.com/gin-contrib/sse"]
    version = "v0.1.0"
    hash = "sha256-zYbMTao+1F+385Lvsba9roLmmt9eYqr57sUWo0LCVhw="
@@ -80,8 +80,8 @@ schema = 3
    version = "v1.5.1-0.20230307220236-3a3c6141e376"
    hash = "sha256-f4k0gSYuo0/q3WOoTxl2eFaj7WZpdz29ih6CKc8Ude8="
  [mod."github.com/go-git/go-billy/v5"]
-    version = "v5.5.0"
-    hash = "sha256-4XUoD2bOCMCdu83egb/y8kY/Fm0s1rWgPMtiahh38OQ="
+    version = "v5.6.0"
+    hash = "sha256-Hw+odNozpiixXqmsbahihdV+TBxpusm6/hDLngf7kUg="
  [mod."github.com/go-git/go-git/v5"]
    version = "v5.12.0"
    hash = "sha256-mD8EWOQ25FtKBWVSQhQ8V1Rr0tC/ySFZQ9GMDLRqwQU="
@@ -98,17 +98,17 @@ schema = 3
    version = "v0.18.1"
    hash = "sha256-2/B2qP51zfiY+k8G0w0D03KXUc7XpWj6wKY7NjNP/9E="
  [mod."github.com/go-playground/validator/v10"]
-    version = "v10.20.0"
-    hash = "sha256-FKF+ebrSedNdh5Wq8aE8UP+5LiM8B28bk8v3gyqqdDk="
+    version = "v10.22.1"
+    hash = "sha256-EsgeltH0ow6saxLvTFVtIyHVqWI3Fiu1AE2Qmnsmowg="
  [mod."github.com/go-shiori/dom"]
    version = "v0.0.0-20230515143342-73569d674e1c"
    hash = "sha256-4lm9KZfR2XnfZU9KTG+4jqLYZqbfL74AMO4y3dKpIbg="
  [mod."github.com/go-shiori/go-readability"]
-    version = "v0.0.0-20240923125239-59a7bd165825"
-    hash = "sha256-9uHe8rZcryKubhN6Rw6ECtSGAku7gkx8gtKotWnyHdM="
+    version = "v0.0.0-20241012063810-92284fa8a71f"
+    hash = "sha256-NgciyWylVSjzkt5xWF1Xk1Xbxgq3PsHW5PZ8oifjZVY="
  [mod."github.com/goccy/go-json"]
-    version = "v0.10.2"
-    hash = "sha256-6fMD2/Rku8HT0zDdeA23pX0YxbohiIOC8OJNYbylJTQ="
+    version = "v0.10.3"
+    hash = "sha256-ZOzfwCXh+qp+hp+UnC0t422hUV0Cq5KANXkx8hcLp7s="
  [mod."github.com/gogs/chardet"]
    version = "v0.0.0-20211120154057-b7413eaefb8f"
    hash = "sha256-4MeqBJsh4U+ZEbfdDwdciTYMlQWkCil2KJbUxHjBSIo="
@@ -146,14 +146,14 @@ schema = 3
    version = "v1.2.0"
    hash = "sha256-Ta7ZOmyX8gG5tzWbY2oES70EJPfI90U7CIJS9EAce0s="
  [mod."github.com/klauspost/cpuid/v2"]
-    version = "v2.2.7"
-    hash = "sha256-bjinp7b7qWk+DcZDDv1EedJxZqGxp2NWY+NYKBfE5xU="
+    version = "v2.2.8"
+    hash = "sha256-/E58BnABQYxO+cmiue7OQqRLWkd/Lh8grX8DjTU4tk8="
  [mod."github.com/leodido/go-urn"]
    version = "v1.4.0"
    hash = "sha256-Q6kplWkY37Tzy6GOme3Wut40jFK4Izun+ij/BJvcEu0="
  [mod."github.com/liushuangls/go-anthropic/v2"]
-    version = "v2.8.0"
-    hash = "sha256-F89FeBbUl/zejzxvR0LZKhHFQmHik5urzVTlEjQj+eg="
+    version = "v2.9.0"
+    hash = "sha256-1bvwuPT5SaYrzKYiXpz0fjDgu3994Hs5MPXZUFPhCLI="
  [mod."github.com/mattn/go-isatty"]
    version = "v0.0.20"
    hash = "sha256-qhw9hWtU5wnyFyuMbKx+7RB8ckQaFQ8D+8GKPkN3HHQ="
@@ -164,14 +164,14 @@ schema = 3
    version = "v1.0.2"
    hash = "sha256-+W9EIW7okXIXjWEgOaMh58eLvBZ7OshW2EhaIpNLSBU="
  [mod."github.com/ollama/ollama"]
-    version = "v0.3.11"
-    hash = "sha256-ydQyt+now2iqal2ZO6oPn61UoGt+RBir0AB2R9e72io="
+    version = "v0.3.14"
+    hash = "sha256-R+jWZzGokwWimPePIcUoZz6tDG2qHFeClgxhT7SEoqw="
  [mod."github.com/otiai10/copy"]
    version = "v1.14.0"
    hash = "sha256-xsaL1ddkPS544y0Jv7u/INUALBYmYq29ddWvysLXk4A="
  [mod."github.com/pelletier/go-toml/v2"]
-    version = "v2.2.2"
-    hash = "sha256-ukxk1Cfm6cQW18g/aa19tLcUu5BnF7VmfAvrDHAOl6A="
+    version = "v2.2.3"
+    hash = "sha256-fE++SVgnCGdnFZoROHWuYjIR7ENl7k9KKxQrRTquv/o="
  [mod."github.com/pjbgf/sha1cd"]
    version = "v0.3.0"
    hash = "sha256-kX9BdLh2dxtGNaDvc24NORO+C0AZ7JzbrXrtecCdB7w="
@@ -185,8 +185,8 @@ schema = 3
    version = "v1.47.0"
    hash = "sha256-jMXexVTlPdZ40STRpBLv7b+BIRqdxxra12Pl2Mj7Nz8="
  [mod."github.com/sashabaranov/go-openai"]
-    version = "v1.30.0"
-    hash = "sha256-vOKCQlLPNvf4CrcPL5Hu07EOB6WCyEPVSB89fdUbdAA="
+    version = "v1.32.5"
+    hash = "sha256-T56gcES0qMZCSL3uFi+G9vmfTk00QlMWONsMS+cxwR0="
  [mod."github.com/sergi/go-diff"]
    version = "v1.3.2-0.20230802210424-5b0b94c5c0d3"
    hash = "sha256-UcLU83CPMbSoKI8RLvLJ7nvGaE2xRSL1RjoHCVkMzUM="
@@ -209,23 +209,23 @@ schema = 3
    version = "v0.24.0"
    hash = "sha256-4H+mGZgG2c9I1y0m8avF4qmt8LUKxxVsTqR8mKgP4yo="
  [mod."go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"]
-    version = "v0.55.0"
-    hash = "sha256-aiaNqHfnhz0NgjxqKJMILa7JcCRweCjBq8i7EiM2sx4="
+    version = "v0.56.0"
+    hash = "sha256-nrdJ7CgH3yKhNkMpvhP2BY4+VL/maR5mrjJCO6Dke2s="
  [mod."go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"]
-    version = "v0.55.0"
-    hash = "sha256-/uNC1W2fMF2jfk5fBwfV4hLo9fLXLHfTkvTv8B/dFGI="
+    version = "v0.56.0"
+    hash = "sha256-Nw9uF/TUoFnH0488VNHVndgoSX+lxZy1Y93Wryl7qP4="
  [mod."go.opentelemetry.io/otel"]
-    version = "v1.30.0"
-    hash = "sha256-2r706a1+LqhT3DNqVZB6NIVaBoPnQ257BJY8UQqtaSM="
+    version = "v1.31.0"
+    hash = "sha256-NQBHyMSRn9vaxSrNHYwv0oX1aJuEpyks/gpYEWHlx6k="
  [mod."go.opentelemetry.io/otel/metric"]
-    version = "v1.30.0"
-    hash = "sha256-mSfy2A7cxIjAOs9tZ74kgVnsnGZoC3be/MjjFlO8KCw="
+    version = "v1.31.0"
+    hash = "sha256-2s5IN8IwPBitqnjIEraOfg8fWd3nIy8jWoKTXa+uUs4="
  [mod."go.opentelemetry.io/otel/trace"]
-    version = "v1.30.0"
-    hash = "sha256-6YukUeYtMo5jtKsoQQwuy3Zyx1Cl2LRMONnF91PCBIk="
+    version = "v1.31.0"
+    hash = "sha256-iVDe3qNzmX1+MQTAoaeIbhnIbu/hnx4OsUIPlxuX1gY="
  [mod."golang.org/x/arch"]
-    version = "v0.8.0"
-    hash = "sha256-zz9sbr+yT6eqjHVlVBfDZVmIkzOT6DZFpN3eaQT4Afw="
+    version = "v0.11.0"
+    hash = "sha256-gl4bqDA/Qv6hhqxROIHTWnNGkidMMN0frp1RqcfNXlY="
  [mod."golang.org/x/crypto"]
    version = "v0.28.0"
    hash = "sha256-AYjr0BcWQMwWY1u8c2hzUprtqHUmAH7RNSxHz2hhnZs="
@@ -245,23 +245,23 @@ schema = 3
    version = "v0.19.0"
    hash = "sha256-C92pSYLLUQ2NKKcc60wpoSJ5UWAfnWkmd997C13fXdU="
  [mod."golang.org/x/time"]
-    version = "v0.6.0"
-    hash = "sha256-gW9TVK9HjLk52lzfo5rBzSunc01gS0+SG2nk0X1w55M="
+    version = "v0.7.0"
+    hash = "sha256-o1ol/hTpfrc06KUXSepAgm4QUuWmH1S+vqg6kmFad64="
  [mod."google.golang.org/api"]
-    version = "v0.197.0"
-    hash = "sha256-OMqA6/WODEKiiMp79GZ3XjnAC7Sc9XFUJcPTlJgHRSE="
+    version = "v0.203.0"
+    hash = "sha256-UlCfDi4LbcBvXVO5gLRWP6/fpfWWHoolRkxzYWGnNqg="
  [mod."google.golang.org/genproto/googleapis/api"]
-    version = "v0.0.0-20240903143218-8af14fe29dc1"
-    hash = "sha256-H40uIAZY8JMCAAe8+fLHbHMI/wNMUL8ukhBdS87p/2E="
+    version = "v0.0.0-20241021214115-324edc3d5d38"
+    hash = "sha256-ASsqfJU1DA57PLRoitSkdlS/p10EEuzl0YuZTdbmMCw="
  [mod."google.golang.org/genproto/googleapis/rpc"]
-    version = "v0.0.0-20240903143218-8af14fe29dc1"
-    hash = "sha256-4T4DTrmFbqT4tD7PSL7Ie7u8ZN2iwGkhK02nWugssxk="
+    version = "v0.0.0-20241021214115-324edc3d5d38"
+    hash = "sha256-Fk+cG5bRI3BvnqhWzvMzbU36cC7PM+o2oAOJmvVx9M0="
  [mod."google.golang.org/grpc"]
-    version = "v1.66.2"
-    hash = "sha256-ZGEQK9lLC55Jkdifef/SO9mRPwEZmMJPXLH6MAKIGDA="
+    version = "v1.67.1"
+    hash = "sha256-VqfKp80c2B1MK4m1WtHW4r7ykqdChJbqaMn+gMEYmYc="
  [mod."google.golang.org/protobuf"]
-    version = "v1.34.2"
-    hash = "sha256-nMTlrDEE2dbpWz50eQMPBQXCyQh4IdjrTIccaU0F3m0="
+    version = "v1.35.1"
+    hash = "sha256-4NtUQoBvlPGFGjo7c+E1EBS/sb8oy50MGy45KGWPpWo="
  [mod."gopkg.in/warnings.v0"]
    version = "v0.1.2"
    hash = "sha256-ATVL9yEmgYbkJ1DkltDGRn/auGAjqGOfjQyBYyUo8s8="
--- a/plugins/ai/dryrun/dryrun.go
+++ b/plugins/ai/dryrun/dryrun.go
@@ -4,10 +4,11 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"github.com/danielmiessler/fabric/plugins"
+
 	goopenai "github.com/sashabaranov/go-openai"

 	"github.com/danielmiessler/fabric/common"
+	"github.com/danielmiessler/fabric/plugins"
 )

 type Client struct {
@@ -44,6 +45,9 @@ func (c *Client) SendStream(msgs []*goopenai.ChatCompletionMessage, opts *common
 	output += fmt.Sprintf("TopP: %f\n", opts.TopP)
 	output += fmt.Sprintf("PresencePenalty: %f\n", opts.PresencePenalty)
 	output += fmt.Sprintf("FrequencyPenalty: %f\n", opts.FrequencyPenalty)
+	if opts.ModelContextLength != 0 {
+		output += fmt.Sprintf("ModelContextLength: %d\n", opts.ModelContextLength)
+	}

 	channel <- output
 	close(channel)
@@ -72,6 +76,9 @@ func (c *Client) Send(_ context.Context, msgs []*goopenai.ChatCompletionMessage,
 	fmt.Printf("TopP: %f\n", opts.TopP)
 	fmt.Printf("PresencePenalty: %f\n", opts.PresencePenalty)
 	fmt.Printf("FrequencyPenalty: %f\n", opts.FrequencyPenalty)
+	if opts.ModelContextLength != 0 {
+		fmt.Printf("ModelContextLength: %d\n", opts.ModelContextLength)
+	}

 	return "", nil
 }
--- a/plugins/ai/ollama/ollama.go
+++ b/plugins/ai/ollama/ollama.go
@@ -3,16 +3,16 @@ package ollama
 import (
 	"context"
 	"fmt"
-	"github.com/danielmiessler/fabric/plugins"
-	goopenai "github.com/sashabaranov/go-openai"
 	"net/http"
 	"net/url"
 	"time"

-	"github.com/danielmiessler/fabric/common"
-	"github.com/samber/lo"
-
 	ollamaapi "github.com/ollama/ollama/api"
+	"github.com/samber/lo"
+	goopenai "github.com/sashabaranov/go-openai"
+
+	"github.com/danielmiessler/fabric/common"
+	"github.com/danielmiessler/fabric/plugins"
 )

 func NewClient() (ret *Client) {
@@ -110,6 +110,10 @@ func (o *Client) createChatRequest(msgs []*goopenai.ChatCompletionMessage, opts
 		"top_p":             opts.TopP,
 	}

+	if opts.ModelContextLength != 0 {
+		options["num_ctx"] = opts.ModelContextLength
+	}
+
 	ret = ollamaapi.ChatRequest{
 		Model:    opts.Model,
 		Messages: messages,
--- a/plugins/tools/defaults.go
+++ b/plugins/tools/defaults.go
@@ -4,9 +4,10 @@ import (
 	"fmt"
 	"strconv"

+	"github.com/pkg/errors"
+
 	"github.com/danielmiessler/fabric/plugins"
 	"github.com/danielmiessler/fabric/plugins/ai"
-	"github.com/pkg/errors"
 )

 func NeeDefaults(getVendorsModels func() (*ai.VendorsModels, error)) (ret *Defaults) {
@@ -21,18 +22,23 @@ func NeeDefaults(getVendorsModels func() (*ai.VendorsModels, error)) (ret *Defau
 	}

 	ret.Vendor = ret.AddSetting("Vendor", true)
+
 	ret.Model = ret.AddSetupQuestionCustom("Model", true,
 		"Enter the index the name of your default model")

+	ret.ModelContextLength = ret.AddSetupQuestionCustom("Model Context Length", false,
+		"Enter model context length")
+
 	return
 }

 type Defaults struct {
 	*plugins.PluginBase

-	Vendor           *plugins.Setting
-	Model            *plugins.SetupQuestion
-	GetVendorsModels func() (*ai.VendorsModels, error)
+	Vendor             *plugins.Setting
+	Model              *plugins.SetupQuestion
+	ModelContextLength *plugins.SetupQuestion
+	GetVendorsModels   func() (*ai.VendorsModels, error)
 }

 func (o *Defaults) Setup() (err error) {
--- a/plugins/tools/youtube/youtube.go
+++ b/plugins/tools/youtube/youtube.go
@@ -85,7 +85,7 @@ func (o *YouTube) GrabTranscript(videoId string, language string) (ret string, e
 	textTags := doc.FindAll("text")
 	var textBuilder strings.Builder
 	for _, textTag := range textTags {
-		textBuilder.WriteString(textTag.Text())
+		textBuilder.WriteString(strings.ReplaceAll(textTag.Text(), "&#39;", "'"))
 		textBuilder.WriteString(" ")
 		ret = textBuilder.String()
 	}
--- a/version.go
+++ b/version.go
@@ -1,3 +1,3 @@
 package main

-var version = "v1.4.83"
+var version = "v1.4.86"
Author	SHA1	Message	Date
github-actions[bot]	8df3a9227f	Update version to v1.4.86 and commit	2024-10-30 15:59:31 +00:00
Eugen Eisler	583695c228	Merge pull request #1088 from jaredmontoya/fix-ollama-context-length feat: add DEFAULT_CONTEXT_LENGTH setting	2024-10-30 16:59:13 +01:00
jaredmontoya	455215290f	add model context length setting	2024-10-30 15:36:01 +01:00
github-actions[bot]	5373345a3c	Update version to v1.4.85 and commit	2024-10-30 12:51:09 +00:00
Eugen Eisler	e17b96d864	feat: write tools output also to output file if defined; fix XouTube transcript ' character	2024-10-30 13:50:52 +01:00
github-actions[bot]	3ec4d274c4	Update version to v1.4.84 and commit	2024-10-30 12:07:37 +00:00
Eugen Eisler	611f8789da	ci: deactivate build triggering at changes of patterns or docu	2024-10-30 13:07:23 +01:00