Compare commits

...

5 Commits

Author SHA1 Message Date
github-actions[bot]
b98316a705 Update version to v1.4.92 and commit 2024-11-05 12:50:54 +00:00
Eugen Eisler
f2d9e0e8ea Merge pull request #1109 from leonsgithub/main
Add docker
2024-11-05 13:50:37 +01:00
github-actions[bot]
f5abaac8b7 Update version to v1.4.91 and commit 2024-11-05 10:25:55 +00:00
Eugen Eisler
0bb4f58222 fix: bufio.Scanner message too long 2024-11-05 11:25:32 +01:00
leon
4453afba89 Add docker 2024-11-04 18:56:55 +01:00
9 changed files with 82 additions and 14 deletions

6
.dockerignore Normal file
View File

@@ -0,0 +1,6 @@
.git
.gitignore
.env
README.md
docker-compose.yml
Dockerfile

41
Dockerfile Normal file
View File

@@ -0,0 +1,41 @@
# Use official golang image as builder
FROM golang:1.22.5-alpine AS builder
# Set working directory
WORKDIR /app
# Copy go mod and sum files
COPY go.mod go.sum ./
# Download dependencies
RUN go mod download
# Copy source code
COPY . .
# Build the application
RUN CGO_ENABLED=0 GOOS=linux go build -o fabric
# Use scratch as final base image
FROM alpine:latest
# Copy the binary from builder
COPY --from=builder /app/fabric /fabric
# Copy patterns directory
COPY patterns /patterns
# Ensure clean config directory and copy ENV file
RUN rm -rf /root/.config/fabric && \
mkdir -p /root/.config/fabric
COPY ENV /root/.config/fabric/.env
# Add debug commands
RUN ls -la /root/.config/fabric/
# Expose port 8080
EXPOSE 8080
# Run the binary with debug output
ENTRYPOINT ["/fabric"]
CMD ["--serve"]

9
ENV Normal file
View File

@@ -0,0 +1,9 @@
DEFAULT_VENDOR=OpenRouter
DEFAULT_MODEL=openai/gpt-3.5-turbo-0125
DEFAULT_MODEL_CONTEXT_LENGTH=128K
PATTERNS_LOADER_GIT_REPO_URL=https://github.com/danielmiessler/fabric.git
PATTERNS_LOADER_GIT_REPO_PATTERNS_FOLDER=patterns
OPENROUTER_API_KEY=sk-or-v1-
OPENROUTER_API_BASE_URL=https://openrouter.ai/api/v1
YOUTUBE_API_KEY=AIzaS
JINA_AI_API_KEY=jina_57

View File

@@ -23,8 +23,6 @@ func Cli(version string) (err error) {
return
}
println("Message: " + currentFlags.Message)
if currentFlags.Version {
fmt.Println(version)
return

View File

@@ -95,18 +95,20 @@ func Init() (ret *Flags, err error) {
// readStdin reads from stdin and returns the input as a string or an error
func readStdin() (ret string, err error) {
scanner := bufio.NewScanner(os.Stdin)
for scanner.Scan() {
ret += scanner.Text() + "\n"
}
if err = scanner.Err(); err != nil {
if errors.Is(err, io.EOF) {
err = nil
} else {
err = fmt.Errorf("error reading piped message from stdin: %w", err)
reader := bufio.NewReader(os.Stdin)
var sb strings.Builder
for {
line, err := reader.ReadString('\n')
if err != nil {
if errors.Is(err, io.EOF) {
sb.WriteString(line)
break
}
return "", fmt.Errorf("error reading piped message from stdin: %w", err)
}
sb.WriteString(line)
}
return
return sb.String(), nil
}
func (o *Flags) BuildChatOptions() (ret *common.ChatOptions) {

11
docker-compose.yml Normal file
View File

@@ -0,0 +1,11 @@
version: '3.8'
services:
fabric-api:
build: .
ports:
- "8080:8080"
volumes:
- ./ENV:/root/.config/fabric/.env:ro
environment:
- GIN_MODE=release

View File

@@ -1 +1 @@
"1.4.90"
"1.4.92"

View File

@@ -59,6 +59,7 @@ func (o *YouTube) GetVideoOrPlaylistId(url string) (videoId string, playlistId s
}
// Video ID pattern
//https:((youtu.be/7qZl_5xHoBw
videoPattern := `(?:https?:\/\/)?(?:www\.)?(?:youtube\.com\/(?:[^\/\n\s]+\/\S+\/|(?:v|e(?:mbed)?)\/|\S*?[?&]v=)|youtu\.be\/)([a-zA-Z0-9_-]{11})`
videoRe := regexp.MustCompile(videoPattern)
videoMatch := videoRe.FindStringSubmatch(url)

View File

@@ -1,3 +1,3 @@
package main
var version = "v1.4.90"
var version = "v1.4.92"