From 0dc97430017cac773fe229a57e2f3161618c82f4 Mon Sep 17 00:00:00 2001
From: Tom X Nguyen <tom81094@gmail.com>
Date: Thu, 29 Aug 2024 17:42:31 +0700
Subject: [PATCH 1/4] feat: add templates feature

---
 devbox.json                          | 14 ++++++++
 devbox.lock                          | 53 ++++++++++++++++++++++++++++
 pkg/adapter/dify/dify.go             |  8 +++--
 pkg/adapter/dify/interface.go        |  2 +-
 pkg/discord/command/sum/sum.go       | 34 +++++++++++++++---
 pkg/discord/service/sum/interface.go |  2 +-
 pkg/discord/service/sum/sum.go       | 11 +++---
 pkg/model/sum.go                     |  7 ++--
 8 files changed, 113 insertions(+), 18 deletions(-)
 create mode 100644 devbox.json
 create mode 100644 devbox.lock

diff --git a/devbox.json b/devbox.json
new file mode 100644
index 0000000..d718e27
--- /dev/null
+++ b/devbox.json
@@ -0,0 +1,14 @@
+{
+  "$schema":  "https://raw.githubusercontent.com/jetify-com/devbox/0.12.0/.schema/devbox.schema.json",
+  "packages": ["go@1.23.0"],
+  "shell": {
+    "init_hook": [
+      "echo 'Welcome to devbox!' > /dev/null"
+    ],
+    "scripts": {
+      "test": [
+        "echo \"Error: no test specified\" && exit 1"
+      ]
+    }
+  }
+}
diff --git a/devbox.lock b/devbox.lock
new file mode 100644
index 0000000..01e3e30
--- /dev/null
+++ b/devbox.lock
@@ -0,0 +1,53 @@
+{
+  "lockfile_version": "1",
+  "packages": {
+    "go@1.23.0": {
+      "last_modified": "2024-08-14T11:41:26Z",
+      "resolved": "github:NixOS/nixpkgs/0cb2fd7c59fed0cd82ef858cbcbdb552b9a33465#go_1_23",
+      "source": "devbox-search",
+      "version": "1.23.0",
+      "systems": {
+        "aarch64-darwin": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/x097y3rdlvw6ax1id52xx2didgzxjg34-go-1.23.0",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/x097y3rdlvw6ax1id52xx2didgzxjg34-go-1.23.0"
+        },
+        "aarch64-linux": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/znns5qk7fbhjb89bqhabxjxpgiq2ag1a-go-1.23.0",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/znns5qk7fbhjb89bqhabxjxpgiq2ag1a-go-1.23.0"
+        },
+        "x86_64-darwin": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/psym5ggdincwihwd81kssc4gbw1k3p3h-go-1.23.0",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/psym5ggdincwihwd81kssc4gbw1k3p3h-go-1.23.0"
+        },
+        "x86_64-linux": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/0k144pnsvy0wa3dcl1y3df7d4zskylc4-go-1.23.0",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/0k144pnsvy0wa3dcl1y3df7d4zskylc4-go-1.23.0"
+        }
+      }
+    }
+  }
+}
diff --git a/pkg/adapter/dify/dify.go b/pkg/adapter/dify/dify.go
index 7ecc97f..fc13465 100644
--- a/pkg/adapter/dify/dify.go
+++ b/pkg/adapter/dify/dify.go
@@ -51,11 +51,13 @@ type AgentMessage struct {
 	Answer string `json:"answer,omitempty"`
 }
 
-func (d *Dify) SummarizeArticle(url string) (content string, err error) {
+func (d *Dify) SummarizeArticle(template, url string) (content string, err error) {
 	// Define the URL and request body
 	requestBody, err := json.Marshal(map[string]interface{}{
-		"inputs":          map[string]interface{}{},
-		"query":           url,
+		"inputs": map[string]interface{}{
+			"template": template,
+		},
+		"query":           fmt.Sprintf("%s %s", template, url),
 		"response_mode":   "streaming",
 		"conversation_id": "",
 		"user":            "fortress",
diff --git a/pkg/adapter/dify/interface.go b/pkg/adapter/dify/interface.go
index 314f8d0..bc5f597 100644
--- a/pkg/adapter/dify/interface.go
+++ b/pkg/adapter/dify/interface.go
@@ -1,5 +1,5 @@
 package dify
 
 type DifyAdapter interface {
-	SummarizeArticle(youtubeURL string) (content string, err error)
+	SummarizeArticle(template, url string) (content string, err error)
 }
diff --git a/pkg/discord/command/sum/sum.go b/pkg/discord/command/sum/sum.go
index 65f84bd..da8f865 100644
--- a/pkg/discord/command/sum/sum.go
+++ b/pkg/discord/command/sum/sum.go
@@ -1,6 +1,7 @@
 package sum
 
 import (
+	"fmt"
 	"github.com/dwarvesf/fortress-discord/pkg/discord/service"
 	"github.com/dwarvesf/fortress-discord/pkg/discord/view"
 	"github.com/dwarvesf/fortress-discord/pkg/logger"
@@ -22,14 +23,37 @@ func New(l logger.Logger, svc service.Servicer, view view.Viewer) SumCommander {
 }
 
 func (e *Sum) Sum(message *model.DiscordMessage) error {
-	url := message.ContentArgs[1]
-	// 1. get data from service
-	data, err := e.svc.Sum().SummarizeArticle(url)
+	var template, url string
+	var data *model.Sum
+	var err error
+
+	switch len(message.ContentArgs) {
+	case 2:
+		// Original behavior: ?sum <url>
+		url = message.ContentArgs[1]
+		data, err = e.svc.Sum().SummarizeArticle("", url)
+	case 3:
+		// New behavior: ?sum <template> <url>
+		template = message.ContentArgs[1]
+		url = message.ContentArgs[2]
+		data, err = e.svc.Sum().SummarizeArticle(template, url)
+	default:
+		errorSummary := &model.Sum{
+			Title:   "Error",
+			Summary: "Invalid command format. Use: ?sum <url> or ?sum <template> <url>",
+		}
+		return e.view.Sum().Sum(message, errorSummary)
+	}
+
 	if err != nil {
 		e.L.Error(err, "failed to summarize the given article")
-		return err
+		errorSummary := &model.Sum{
+			Title:   "Error",
+			Summary: fmt.Sprintf("Failed to summarize the article: %v", err),
+		}
+		return e.view.Sum().Sum(message, errorSummary)
 	}
 
-	// 2. render
+	// render
 	return e.view.Sum().Sum(message, data)
 }
diff --git a/pkg/discord/service/sum/interface.go b/pkg/discord/service/sum/interface.go
index 1cad150..c51f8d8 100644
--- a/pkg/discord/service/sum/interface.go
+++ b/pkg/discord/service/sum/interface.go
@@ -3,5 +3,5 @@ package sum
 import "github.com/dwarvesf/fortress-discord/pkg/model"
 
 type SumServicer interface {
-	SummarizeArticle(url string) (*model.Sum, error)
+	SummarizeArticle(template, url string) (*model.Sum, error)
 }
diff --git a/pkg/discord/service/sum/sum.go b/pkg/discord/service/sum/sum.go
index 0989bd1..4e43d37 100644
--- a/pkg/discord/service/sum/sum.go
+++ b/pkg/discord/service/sum/sum.go
@@ -21,8 +21,8 @@ func New(adapter adapter.IAdapter, l logger.Logger) SumServicer {
 	}
 }
 
-func (e *Sum) SummarizeArticle(url string) (*model.Sum, error) {
-	data, err := e.adapter.Dify().SummarizeArticle(url)
+func (e *Sum) SummarizeArticle(template, url string) (*model.Sum, error) {
+	data, err := e.adapter.Dify().SummarizeArticle(template, url)
 	if err != nil {
 		fmt.Printf("failed to summarize the given article. Error: %v\n", err)
 		return nil, err
@@ -30,9 +30,10 @@ func (e *Sum) SummarizeArticle(url string) (*model.Sum, error) {
 	title, summary := extractTitleAndSummary(data)
 
 	return &model.Sum{
-		URL:     url,
-		Title:   title,
-		Summary: summary,
+		URL:      url,
+		Title:    title,
+		Summary:  summary,
+		Template: template,
 	}, nil
 }
 
diff --git a/pkg/model/sum.go b/pkg/model/sum.go
index d67fa81..d01585e 100644
--- a/pkg/model/sum.go
+++ b/pkg/model/sum.go
@@ -8,7 +8,8 @@ type AdapterSum struct {
 
 // Sum is in-app model, after process from adapters
 type Sum struct {
-	URL     string `json:"url"`
-	Title   string `json:"title"`
-	Summary string `json:"summary"`
+	URL      string `json:"url"`
+	Title    string `json:"title"`
+	Summary  string `json:"summary"`
+	Template string `json:"template"`
 }

From 48ff9c164a339abe94188f0e0758e3eea2f204f2 Mon Sep 17 00:00:00 2001
From: Tom X Nguyen <tom81094@gmail.com>
Date: Thu, 29 Aug 2024 18:57:34 +0700
Subject: [PATCH 2/4] chore: add enum types to differentiate the templates

---
 pkg/discord/command/sum/sum.go | 13 +++++++++++--
 pkg/model/template.go          | 19 +++++++++++++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 pkg/model/template.go

diff --git a/pkg/discord/command/sum/sum.go b/pkg/discord/command/sum/sum.go
index da8f865..d9ea912 100644
--- a/pkg/discord/command/sum/sum.go
+++ b/pkg/discord/command/sum/sum.go
@@ -23,7 +23,8 @@ func New(l logger.Logger, svc service.Servicer, view view.Viewer) SumCommander {
 }
 
 func (e *Sum) Sum(message *model.DiscordMessage) error {
-	var template, url string
+	var template string
+	var url string
 	var data *model.Sum
 	var err error
 
@@ -31,11 +32,19 @@ func (e *Sum) Sum(message *model.DiscordMessage) error {
 	case 2:
 		// Original behavior: ?sum <url>
 		url = message.ContentArgs[1]
-		data, err = e.svc.Sum().SummarizeArticle("", url)
+		data, err = e.svc.Sum().SummarizeArticle(string(model.TemplateSummary), url)
 	case 3:
 		// New behavior: ?sum <template> <url>
 		template = message.ContentArgs[1]
 		url = message.ContentArgs[2]
+		if !model.IsValidTemplateType(template) {
+			errorSummary := &model.Sum{
+				Title:   "Error",
+				Summary: fmt.Sprintf("Invalid template type. Supported types are: %s, %s, %s, %s", 
+					model.TemplateSummary, model.TemplateKeyPoints, model.TemplateNuggets, model.TemplateFacts),
+			}
+			return e.view.Sum().Sum(message, errorSummary)
+		}
 		data, err = e.svc.Sum().SummarizeArticle(template, url)
 	default:
 		errorSummary := &model.Sum{
diff --git a/pkg/model/template.go b/pkg/model/template.go
new file mode 100644
index 0000000..9a49f9d
--- /dev/null
+++ b/pkg/model/template.go
@@ -0,0 +1,19 @@
+package model
+
+type TemplateType string
+
+const (
+	TemplateSummary   TemplateType = "summary"
+	TemplateKeyPoints TemplateType = "key_points"
+	TemplateNuggets   TemplateType = "nuggets"
+	TemplateFacts     TemplateType = "facts"
+)
+
+func IsValidTemplateType(t string) bool {
+	switch TemplateType(t) {
+	case TemplateSummary, TemplateKeyPoints, TemplateNuggets, TemplateFacts:
+		return true
+	default:
+		return false
+	}
+}
\ No newline at end of file

From 085e273fd7b879b28a9ee65a8a3186ad843db64a Mon Sep 17 00:00:00 2001
From: Tom X Nguyen <tom81094@gmail.com>
Date: Fri, 30 Aug 2024 08:59:41 +0700
Subject: [PATCH 3/4] fix: make the command argument independent

---
 pkg/discord/command/sum/sum.go | 48 +++++++++++++++++++---------------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/pkg/discord/command/sum/sum.go b/pkg/discord/command/sum/sum.go
index d9ea912..6de455b 100644
--- a/pkg/discord/command/sum/sum.go
+++ b/pkg/discord/command/sum/sum.go
@@ -6,6 +6,7 @@ import (
 	"github.com/dwarvesf/fortress-discord/pkg/discord/view"
 	"github.com/dwarvesf/fortress-discord/pkg/logger"
 	"github.com/dwarvesf/fortress-discord/pkg/model"
+	"net/url"
 )
 
 type Sum struct {
@@ -24,36 +25,35 @@ func New(l logger.Logger, svc service.Servicer, view view.Viewer) SumCommander {
 
 func (e *Sum) Sum(message *model.DiscordMessage) error {
 	var template string
-	var url string
+	var articleURL string
 	var data *model.Sum
 	var err error
 
-	switch len(message.ContentArgs) {
-	case 2:
-		// Original behavior: ?sum <url>
-		url = message.ContentArgs[1]
-		data, err = e.svc.Sum().SummarizeArticle(string(model.TemplateSummary), url)
-	case 3:
-		// New behavior: ?sum <template> <url>
-		template = message.ContentArgs[1]
-		url = message.ContentArgs[2]
-		if !model.IsValidTemplateType(template) {
-			errorSummary := &model.Sum{
-				Title:   "Error",
-				Summary: fmt.Sprintf("Invalid template type. Supported types are: %s, %s, %s, %s", 
-					model.TemplateSummary, model.TemplateKeyPoints, model.TemplateNuggets, model.TemplateFacts),
-			}
-			return e.view.Sum().Sum(message, errorSummary)
+	// Parse arguments
+	for _, arg := range message.ContentArgs[1:] {
+		if isValidURL(arg) {
+			articleURL = arg
+		} else if model.IsValidTemplateType(arg) {
+			template = arg
 		}
-		data, err = e.svc.Sum().SummarizeArticle(template, url)
-	default:
+	}
+
+	// Validate parsed arguments
+	if articleURL == "" {
 		errorSummary := &model.Sum{
 			Title:   "Error",
-			Summary: "Invalid command format. Use: ?sum <url> or ?sum <template> <url>",
+			Summary: "No valid URL provided. Use: ?sum <url> or ?sum <template> <url> or ?sum <url> <template>",
 		}
 		return e.view.Sum().Sum(message, errorSummary)
 	}
 
+	// If no template is provided, use the default summary template
+	if template == "" {
+		template = string(model.TemplateSummary)
+	}
+
+	// Summarize the article
+	data, err = e.svc.Sum().SummarizeArticle(template, articleURL)
 	if err != nil {
 		e.L.Error(err, "failed to summarize the given article")
 		errorSummary := &model.Sum{
@@ -63,6 +63,12 @@ func (e *Sum) Sum(message *model.DiscordMessage) error {
 		return e.view.Sum().Sum(message, errorSummary)
 	}
 
-	// render
+	// Render the summary
 	return e.view.Sum().Sum(message, data)
 }
+
+// isValidURL checks if a string is a valid URL
+func isValidURL(str string) bool {
+	u, err := url.Parse(str)
+	return err == nil && u.Scheme != "" && u.Host != ""
+}

From e0f260e13ec12c8f461838f26f7539afb2f402c5 Mon Sep 17 00:00:00 2001
From: Tom X Nguyen <tom81094@gmail.com>
Date: Fri, 30 Aug 2024 10:42:00 +0700
Subject: [PATCH 4/4] chore: actually no need to pass it here

---
 pkg/adapter/dify/dify.go | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkg/adapter/dify/dify.go b/pkg/adapter/dify/dify.go
index fc13465..d5b67f6 100644
--- a/pkg/adapter/dify/dify.go
+++ b/pkg/adapter/dify/dify.go
@@ -54,9 +54,7 @@ type AgentMessage struct {
 func (d *Dify) SummarizeArticle(template, url string) (content string, err error) {
 	// Define the URL and request body
 	requestBody, err := json.Marshal(map[string]interface{}{
-		"inputs": map[string]interface{}{
-			"template": template,
-		},
+		"inputs":          map[string]interface{}{},
 		"query":           fmt.Sprintf("%s %s", template, url),
 		"response_mode":   "streaming",
 		"conversation_id": "",