Update version to v1.4.140 and commit

Updated ollama.go to fix a couple of potential DoS issues

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

@@ -13,6 +13,7 @@ permissions:
 
 jobs:
   update-version:
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
 
     steps:

README.md

@@ -66,9 +66,9 @@
 ## Updates
 
 > [!NOTE]
-> February 5, 2025
+> February 24, 2025
 >
-> - Remember that `fabric` supports `o1` and `o3` models, but you need to 1) not use `-s`, and 2) use the `--raw` flag because the o1 and o3 models don't support the `--stream` option or temperature settings.
+> - Fabric now supports Sonnet 3.7! Update and use `-S` to select it as your default if you want, or just use the shortcut `-m claude-3-7-sonnet-latest`. Enjoy!
 
 ## What and why
 

WEB INTERFACE MOD README FILES/pr-1284-update.md

@@ -1,4 +1,6 @@
-# Enhanced Pattern Selection, Pattern Descriptions, New Pattern TAG System, Language Support and other WEB UI Improvements  V3
+https://youtu.be/bhwtWXoMASA# Enhanced Pattern Selection, 
+Pattern Descriptions, New 
+Pattern TAG System, Language Support and other WEB UI Improvements  V3
 
 This Cummulative PR adds several Web UI and functionality improvements to make pattern selection more intuitive (pattern descriptions), ability to save favorite patterns, powerful multilingual capabilities, a Pattern TAG system, a help reference section, more robust Youtube processing and a variety of ui improvements. 
 

go.mod

@@ -6,7 +6,7 @@ toolchain go1.23.1
 
 require (
 	github.com/anaskhan96/soup v1.2.5
-	github.com/anthropics/anthropic-sdk-go v0.2.0-alpha.4
+	github.com/anthropics/anthropic-sdk-go v0.2.0-alpha.11
 	github.com/atotto/clipboard v0.1.4
 	github.com/gabriel-vasile/mimetype v1.4.6
 	github.com/gin-gonic/gin v1.10.0

go.sum

@@ -25,6 +25,9 @@ github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFI
 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
 github.com/anthropics/anthropic-sdk-go v0.2.0-alpha.4 h1:TdGQS+RoR4AUO6gqUL74yK1dz/Arrt/WG+dxOj6Yo6A=
 github.com/anthropics/anthropic-sdk-go v0.2.0-alpha.4/go.mod h1:GJxtdOs9K4neo8Gg65CjJ7jNautmldGli5/OFNabOoo=
+github.com/anthropics/anthropic-sdk-go v0.2.0-alpha.11 h1:O3/AMObKntZyu1KH6Xks6E0gbE8w6HVaKHE+/vXARzM=
+github.com/anthropics/anthropic-sdk-go v0.2.0-alpha.11/go.mod h1:GJxtdOs9K4neo8Gg65CjJ7jNautmldGli5/OFNabOoo=
+github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40/go.mod h1:Q7yQnSMnLvcXlZ8RV+jwz/6y1rQTqbX6C82SndT52Zs=
 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=

gomod2nix.toml

@@ -35,8 +35,8 @@ schema = 3
     version = "v1.3.2"
     hash = "sha256-Nc9SkqJO/ecincVcUBFITy24TMmMGj5o0Q8EgdNhrEk="
   [mod."github.com/anthropics/anthropic-sdk-go"]
-    version = "v0.2.0-alpha.4"
-    hash = "sha256-8a85Hd4J7eaWvN+J6MImsapStbse5WDDjlODZk3PMzk="
+    version = "v0.2.0-alpha.11"
+    hash = "sha256-0wl62e6AVhDY3KkoYrfAHFtBrwNC4nzqrR55iyCJlwk="
   [mod."github.com/araddon/dateparse"]
     version = "v0.0.0-20210429162001-6b43995a97de"
     hash = "sha256-UuX84naeRGMsFOgIgRoBHG5sNy1CzBkWPKmd6VbLwFw="

pkgs/fabric/version.nix

@@ -1 +1 @@
-"1.4.137"
+"1.4.140"

plugins/ai/anthropic/anthropic.go

@@ -31,12 +31,13 @@ func NewClient() (ret *Client) {
 	ret.maxTokens = 4096
 	ret.defaultRequiredUserMessage = "Hi"
 	ret.models = []string{
+		anthropic.ModelClaude3_7SonnetLatest, anthropic.ModelClaude3_7Sonnet20250219,
 		anthropic.ModelClaude3_5HaikuLatest, anthropic.ModelClaude3_5Haiku20241022,
 		anthropic.ModelClaude3_5SonnetLatest, anthropic.ModelClaude3_5Sonnet20241022,
 		anthropic.ModelClaude_3_5_Sonnet_20240620, anthropic.ModelClaude3OpusLatest,
 		anthropic.ModelClaude_3_Opus_20240229, anthropic.ModelClaude_3_Sonnet_20240229,
 		anthropic.ModelClaude_3_Haiku_20240307, anthropic.ModelClaude_2_1,
-		anthropic.ModelClaude_2_0, anthropic.ModelClaude_Instant_1_2,
+		anthropic.ModelClaude_2_0,
 	}
 
 	return

restapi/chat.go

@@ -55,6 +55,7 @@ func (h *ChatHandler) HandleChat(c *gin.Context) {
 
 	if err := c.BindJSON(&request); err != nil {
 		log.Printf("Error binding JSON: %v", err)
+		c.Writer.Header().Set("Strict-Transport-Security", "max-age=63072000; includeSubDomains")
 		c.JSON(http.StatusBadRequest, gin.H{"error": fmt.Sprintf("Invalid request format: %v", err)})
 		return
 	}

restapi/configuration.go

@@ -90,7 +90,7 @@ func (h *ConfigHandler) UpdateConfig(c *gin.Context) {
 		LMStudioURL      string `json:"lm_studio_base_url"`
 	}
 
-	if err := c.BindJSON(&config); err != nil {
+	if err := c.ShouldBindJSON(&config); err != nil {
 		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 		return
 	}

restapi/ollama.go

@@ -5,18 +5,32 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/danielmiessler/fabric/core"
-	"github.com/gin-gonic/gin"
 	"io"
 	"log"
 	"net/http"
 	"strings"
 	"time"
+
+	"github.com/danielmiessler/fabric/core"
+	"github.com/gin-gonic/gin"
 )
 
 type OllamaModel struct {
 	Models []Model `json:"models"`
 }
+
+func isValidOllamaRequestBody(body OllamaRequestBody) bool {
+	if body.Model == "" || len(body.Messages) == 0 {
+		return false
+	}
+	for _, msg := range body.Messages {
+		if msg.Content == "" || msg.Role == "" {
+			return false
+		}
+	}
+	return true
+}
+
 type Model struct {
 	Details    ModelDetails `json:"details"`
 	Digest     string       `json:"digest"`
@@ -142,12 +156,16 @@ func (f APIConvert) ollamaTags(c *gin.Context) {
 		})
 	}
 
-	c.JSON(200, response)
-
-}
-
-func (f APIConvert) ollamaChat(c *gin.Context) {
-	body, err := io.ReadAll(c.Request.Body)
+	if !isValidOllamaRequestBody(prompt) {
+		log.Printf("Invalid request body: %v", prompt)
+		c.JSON(http.StatusBadRequest, gin.H{"error": "invalid request body"})
+		return
+	}
+	if !isValidOllamaRequestBody(prompt) {
+		log.Printf("Invalid request body: %v", prompt)
+		c.JSON(http.StatusBadRequest, gin.H{"error": "invalid request body"})
+		return
+	}
 	if err != nil {
 		log.Printf("Error reading body: %v", err)
 		c.JSON(http.StatusInternalServerError, gin.H{"error": "testing endpoint"})

version.go

@@ -1,3 +1,3 @@
 package main
 
-var version = "v1.4.137"
+var version = "v1.4.140"