소스 검색

fix: move packager to pkg

Yeuoly 5 달 전
부모
커밋
975f9d5c31
35개의 변경된 파일22개의 추가작업 그리고 22개의 파일을 삭제
  1. 1 1
      cmd/commandline/bundle/dep.go
  2. 1 1
      cmd/commandline/plugin/checksum.go
  3. 1 1
      cmd/commandline/plugin/module.go
  4. 2 2
      cmd/commandline/plugin/package.go
  5. 1 1
      cmd/commandline/plugin/permission.go
  6. 1 1
      cmd/license/sign/main.go
  7. 1 1
      cmd/license/verify/main.go
  8. 1 1
      internal/core/plugin_manager/basic_runtime/checksum.go
  9. 1 1
      internal/core/plugin_manager/install_to_serverless.go
  10. 1 1
      internal/core/plugin_manager/launcher.go
  11. 1 1
      internal/core/plugin_manager/manager.go
  12. 1 1
      internal/core/plugin_manager/serverless_connector/launch.go
  13. 1 1
      internal/service/install_plugin.go
  14. 2 2
      internal/service/plugin_decoder.go
  15. 0 0
      pkg/bundle_packager/bundle_packager.go
  16. 1 1
      internal/core/bundle_packager/generic.go
  17. 0 0
      pkg/bundle_packager/local.go
  18. 0 0
      pkg/bundle_packager/memory_zip.go
  19. 0 0
      pkg/bundle_packager/zip.go
  20. 0 0
      pkg/plugin_packager/.difyignore
  21. 0 0
      pkg/plugin_packager/_assets/test.svg
  22. 0 0
      pkg/plugin_packager/decoder/checksum.go
  23. 0 0
      pkg/plugin_packager/decoder/decoder.go
  24. 0 0
      pkg/plugin_packager/decoder/fs.go
  25. 0 0
      pkg/plugin_packager/decoder/helper.go
  26. 0 0
      pkg/plugin_packager/decoder/verifier.go
  27. 0 0
      pkg/plugin_packager/decoder/zip.go
  28. 0 0
      pkg/plugin_packager/ignored
  29. 0 0
      pkg/plugin_packager/manifest.yaml
  30. 0 0
      pkg/plugin_packager/neko.yaml
  31. 0 0
      pkg/plugin_packager/packager/file_scanner.go
  32. 1 1
      internal/core/plugin_packager/packager/packager.go
  33. 0 0
      pkg/plugin_packager/packager/validator.go
  34. 3 3
      internal/core/plugin_packager/packager_test.go
  35. 1 1
      internal/core/plugin_packager/signer/sign.go

+ 1 - 1
cmd/commandline/bundle/dep.go

@@ -3,8 +3,8 @@ package bundle
 import (
 	"os"
 
-	"github.com/langgenius/dify-plugin-daemon/internal/core/bundle_packager"
 	"github.com/langgenius/dify-plugin-daemon/internal/utils/log"
+	"github.com/langgenius/dify-plugin-daemon/pkg/bundle_packager"
 	"github.com/langgenius/dify-plugin-daemon/pkg/entities/bundle_entities"
 )
 

+ 1 - 1
cmd/commandline/plugin/checksum.go

@@ -3,8 +3,8 @@ package plugin
 import (
 	"os"
 
-	"github.com/langgenius/dify-plugin-daemon/internal/core/plugin_packager/decoder"
 	"github.com/langgenius/dify-plugin-daemon/internal/utils/log"
+	"github.com/langgenius/dify-plugin-daemon/pkg/plugin_packager/decoder"
 )
 
 func CalculateChecksum(pluginPath string) {

+ 1 - 1
cmd/commandline/plugin/module.go

@@ -6,9 +6,9 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/langgenius/dify-plugin-daemon/internal/core/plugin_packager/decoder"
 	"github.com/langgenius/dify-plugin-daemon/internal/utils/log"
 	"github.com/langgenius/dify-plugin-daemon/pkg/entities/constants"
+	"github.com/langgenius/dify-plugin-daemon/pkg/plugin_packager/decoder"
 )
 
 const TOOL_MODULE_TEMPLATE = `

+ 2 - 2
cmd/commandline/plugin/package.go

@@ -3,9 +3,9 @@ package plugin
 import (
 	"os"
 
-	"github.com/langgenius/dify-plugin-daemon/internal/core/plugin_packager/decoder"
-	"github.com/langgenius/dify-plugin-daemon/internal/core/plugin_packager/packager"
 	"github.com/langgenius/dify-plugin-daemon/internal/utils/log"
+	"github.com/langgenius/dify-plugin-daemon/pkg/plugin_packager/decoder"
+	"github.com/langgenius/dify-plugin-daemon/pkg/plugin_packager/packager"
 )
 
 var (

+ 1 - 1
cmd/commandline/plugin/permission.go

@@ -9,9 +9,9 @@ import (
 
 	ti "github.com/charmbracelet/bubbles/textinput"
 	tea "github.com/charmbracelet/bubbletea"
-	"github.com/langgenius/dify-plugin-daemon/internal/core/plugin_packager/decoder"
 	"github.com/langgenius/dify-plugin-daemon/internal/utils/log"
 	"github.com/langgenius/dify-plugin-daemon/pkg/entities/plugin_entities"
+	"github.com/langgenius/dify-plugin-daemon/pkg/plugin_packager/decoder"
 )
 
 var permissionKeySeq = []string{

+ 1 - 1
cmd/license/sign/main.go

@@ -4,8 +4,8 @@ import (
 	"flag"
 	"os"
 
-	"github.com/langgenius/dify-plugin-daemon/internal/core/plugin_packager/signer"
 	"github.com/langgenius/dify-plugin-daemon/internal/utils/log"
+	"github.com/langgenius/dify-plugin-daemon/pkg/plugin_packager/signer"
 )
 
 func main() {

+ 1 - 1
cmd/license/verify/main.go

@@ -4,8 +4,8 @@ import (
 	"flag"
 	"os"
 
-	"github.com/langgenius/dify-plugin-daemon/internal/core/plugin_packager/decoder"
 	"github.com/langgenius/dify-plugin-daemon/internal/utils/log"
+	"github.com/langgenius/dify-plugin-daemon/pkg/plugin_packager/decoder"
 )
 
 func main() {

+ 1 - 1
internal/core/plugin_manager/basic_runtime/checksum.go

@@ -3,7 +3,7 @@ package basic_runtime
 import (
 	"os"
 
-	"github.com/langgenius/dify-plugin-daemon/internal/core/plugin_packager/decoder"
+	"github.com/langgenius/dify-plugin-daemon/pkg/plugin_packager/decoder"
 )
 
 type BasicChecksum struct {

+ 1 - 1
internal/core/plugin_manager/install_to_serverless.go

@@ -4,11 +4,11 @@ import (
 	"fmt"
 
 	serverless "github.com/langgenius/dify-plugin-daemon/internal/core/plugin_manager/serverless_connector"
-	"github.com/langgenius/dify-plugin-daemon/internal/core/plugin_packager/decoder"
 	"github.com/langgenius/dify-plugin-daemon/internal/db"
 	"github.com/langgenius/dify-plugin-daemon/internal/types/models"
 	"github.com/langgenius/dify-plugin-daemon/internal/utils/routine"
 	"github.com/langgenius/dify-plugin-daemon/internal/utils/stream"
+	"github.com/langgenius/dify-plugin-daemon/pkg/plugin_packager/decoder"
 )
 
 // InstallToAWSFromPkg installs a plugin to AWS Lambda

+ 1 - 1
internal/core/plugin_manager/launcher.go

@@ -9,10 +9,10 @@ import (
 
 	"github.com/langgenius/dify-plugin-daemon/internal/core/plugin_manager/basic_runtime"
 	"github.com/langgenius/dify-plugin-daemon/internal/core/plugin_manager/local_runtime"
-	"github.com/langgenius/dify-plugin-daemon/internal/core/plugin_packager/decoder"
 	"github.com/langgenius/dify-plugin-daemon/internal/utils/log"
 	"github.com/langgenius/dify-plugin-daemon/internal/utils/routine"
 	"github.com/langgenius/dify-plugin-daemon/pkg/entities/plugin_entities"
+	"github.com/langgenius/dify-plugin-daemon/pkg/plugin_packager/decoder"
 )
 
 type pluginRuntimeWithDecoder struct {

+ 1 - 1
internal/core/plugin_manager/manager.go

@@ -10,7 +10,6 @@ import (
 	"github.com/langgenius/dify-plugin-daemon/internal/core/plugin_manager/debugging_runtime"
 	"github.com/langgenius/dify-plugin-daemon/internal/core/plugin_manager/media_transport"
 	serverless "github.com/langgenius/dify-plugin-daemon/internal/core/plugin_manager/serverless_connector"
-	"github.com/langgenius/dify-plugin-daemon/internal/core/plugin_packager/decoder"
 	"github.com/langgenius/dify-plugin-daemon/internal/db"
 	"github.com/langgenius/dify-plugin-daemon/internal/oss"
 	"github.com/langgenius/dify-plugin-daemon/internal/types/app"
@@ -21,6 +20,7 @@ import (
 	"github.com/langgenius/dify-plugin-daemon/internal/utils/log"
 	"github.com/langgenius/dify-plugin-daemon/internal/utils/mapping"
 	"github.com/langgenius/dify-plugin-daemon/pkg/entities/plugin_entities"
+	"github.com/langgenius/dify-plugin-daemon/pkg/plugin_packager/decoder"
 )
 
 type PluginManager struct {

+ 1 - 1
internal/core/plugin_manager/serverless_connector/launch.go

@@ -4,9 +4,9 @@ import (
 	"bytes"
 	"time"
 
-	"github.com/langgenius/dify-plugin-daemon/internal/core/plugin_packager/decoder"
 	"github.com/langgenius/dify-plugin-daemon/internal/utils/cache"
 	"github.com/langgenius/dify-plugin-daemon/internal/utils/stream"
+	"github.com/langgenius/dify-plugin-daemon/pkg/plugin_packager/decoder"
 )
 
 var (

+ 1 - 1
internal/service/install_plugin.go

@@ -6,7 +6,6 @@ import (
 	"time"
 
 	"github.com/langgenius/dify-plugin-daemon/internal/core/plugin_manager"
-	"github.com/langgenius/dify-plugin-daemon/internal/core/plugin_packager/decoder"
 	"github.com/langgenius/dify-plugin-daemon/internal/db"
 	"github.com/langgenius/dify-plugin-daemon/internal/types/app"
 	"github.com/langgenius/dify-plugin-daemon/internal/types/exception"
@@ -18,6 +17,7 @@ import (
 	"github.com/langgenius/dify-plugin-daemon/internal/utils/stream"
 	"github.com/langgenius/dify-plugin-daemon/pkg/entities"
 	"github.com/langgenius/dify-plugin-daemon/pkg/entities/plugin_entities"
+	"github.com/langgenius/dify-plugin-daemon/pkg/plugin_packager/decoder"
 	"gorm.io/gorm"
 )
 

+ 2 - 2
internal/service/plugin_decoder.go

@@ -6,15 +6,15 @@ import (
 	"mime/multipart"
 
 	"github.com/gin-gonic/gin"
-	"github.com/langgenius/dify-plugin-daemon/internal/core/bundle_packager"
 	"github.com/langgenius/dify-plugin-daemon/internal/core/plugin_manager"
-	"github.com/langgenius/dify-plugin-daemon/internal/core/plugin_packager/decoder"
 	"github.com/langgenius/dify-plugin-daemon/internal/types/app"
 	"github.com/langgenius/dify-plugin-daemon/internal/types/exception"
 	"github.com/langgenius/dify-plugin-daemon/internal/utils/cache/helper"
+	"github.com/langgenius/dify-plugin-daemon/pkg/bundle_packager"
 	"github.com/langgenius/dify-plugin-daemon/pkg/entities"
 	"github.com/langgenius/dify-plugin-daemon/pkg/entities/bundle_entities"
 	"github.com/langgenius/dify-plugin-daemon/pkg/entities/plugin_entities"
+	"github.com/langgenius/dify-plugin-daemon/pkg/plugin_packager/decoder"
 )
 
 func UploadPluginPkg(

internal/core/bundle_packager/bundle_packager.go → pkg/bundle_packager/bundle_packager.go


+ 1 - 1
internal/core/bundle_packager/generic.go

@@ -7,10 +7,10 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/langgenius/dify-plugin-daemon/internal/core/plugin_packager/decoder"
 	"github.com/langgenius/dify-plugin-daemon/internal/utils/parser"
 	"github.com/langgenius/dify-plugin-daemon/pkg/entities/bundle_entities"
 	"github.com/langgenius/dify-plugin-daemon/pkg/entities/manifest_entities"
+	"github.com/langgenius/dify-plugin-daemon/pkg/plugin_packager/decoder"
 )
 
 type GenericBundlePackager struct {

internal/core/bundle_packager/local.go → pkg/bundle_packager/local.go


internal/core/bundle_packager/memory_zip.go → pkg/bundle_packager/memory_zip.go


internal/core/bundle_packager/zip.go → pkg/bundle_packager/zip.go


internal/core/plugin_packager/.difyignore → pkg/plugin_packager/.difyignore


internal/core/plugin_packager/_assets/test.svg → pkg/plugin_packager/_assets/test.svg


internal/core/plugin_packager/decoder/checksum.go → pkg/plugin_packager/decoder/checksum.go


internal/core/plugin_packager/decoder/decoder.go → pkg/plugin_packager/decoder/decoder.go


internal/core/plugin_packager/decoder/fs.go → pkg/plugin_packager/decoder/fs.go


internal/core/plugin_packager/decoder/helper.go → pkg/plugin_packager/decoder/helper.go


internal/core/plugin_packager/decoder/verifier.go → pkg/plugin_packager/decoder/verifier.go


internal/core/plugin_packager/decoder/zip.go → pkg/plugin_packager/decoder/zip.go


internal/core/plugin_packager/ignored → pkg/plugin_packager/ignored


internal/core/plugin_packager/manifest.yaml → pkg/plugin_packager/manifest.yaml


internal/core/plugin_packager/neko.yaml → pkg/plugin_packager/neko.yaml


internal/core/plugin_packager/packager/file_scanner.go → pkg/plugin_packager/packager/file_scanner.go


+ 1 - 1
internal/core/plugin_packager/packager/packager.go

@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/langgenius/dify-plugin-daemon/internal/core/plugin_packager/decoder"
+	"github.com/langgenius/dify-plugin-daemon/pkg/plugin_packager/decoder"
 )
 
 type Packager struct {

internal/core/plugin_packager/packager/validator.go → pkg/plugin_packager/packager/validator.go


+ 3 - 3
internal/core/plugin_packager/packager_test.go

@@ -7,9 +7,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/langgenius/dify-plugin-daemon/internal/core/plugin_packager/decoder"
-	"github.com/langgenius/dify-plugin-daemon/internal/core/plugin_packager/packager"
-	"github.com/langgenius/dify-plugin-daemon/internal/core/plugin_packager/signer"
+	"github.com/langgenius/dify-plugin-daemon/pkg/plugin_packager/decoder"
+	"github.com/langgenius/dify-plugin-daemon/pkg/plugin_packager/packager"
+	"github.com/langgenius/dify-plugin-daemon/pkg/plugin_packager/signer"
 )
 
 //go:embed manifest.yaml

+ 1 - 1
internal/core/plugin_packager/signer/sign.go

@@ -11,9 +11,9 @@ import (
 	"time"
 
 	"github.com/langgenius/dify-plugin-daemon/internal/core/license/private_key"
-	"github.com/langgenius/dify-plugin-daemon/internal/core/plugin_packager/decoder"
 	"github.com/langgenius/dify-plugin-daemon/internal/utils/encryption"
 	"github.com/langgenius/dify-plugin-daemon/internal/utils/parser"
+	"github.com/langgenius/dify-plugin-daemon/pkg/plugin_packager/decoder"
 )
 
 /*