0.2.0 (#402)

* feat(oauth): add RedirectURI field to OAuth request structures

* feat(oauth): update OAuthSchema validation

* feat: add Context field to request and session structures

* feat: add CredentialType field to Credentials and InvokeToolRequest structures

* fix: handle unhandled default case in basic_type.go

* feat: add support for build branches in build-push.yml

Author: Mairuis

.github/workflows/build-push.yml

@@ -5,6 +5,7 @@ on:
     branches:
       - "main"
       - "deploy/dev"
+      - "build/**"
   pull_request:
     branches:
       - "main"
@@ -28,7 +29,7 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-        
+
       - name: Set matrix
         id: set-matrix
         run: |

internal/core/dify_invocation/types.go

@@ -230,7 +230,9 @@ func (r *InvokeEncryptRequest) EncryptRequired(settings map[string]any) bool {
 
 type InvokeToolRequest struct {
 	BaseInvokeDifyRequest
-	ToolType requests.ToolType `json:"tool_type" validate:"required,tool_type"`
+	ToolType       requests.ToolType `json:"tool_type" validate:"required,tool_type"`
+	CredentialId   string            `json:"credential_id" validate:"omitempty"`
+	CredentialType string            `json:"credential_type" validate:"omitempty"`
 	requests.InvokeToolSchema
 }
 

internal/core/session_manager/session.go

@@ -35,10 +35,11 @@ type Session struct {
 	Declaration            *plugin_entities.PluginDeclaration     `json:"declaration"`
 
 	// information about incoming request
-	ConversationID *string `json:"conversation_id"`
-	MessageID      *string `json:"message_id"`
-	AppID          *string `json:"app_id"`
-	EndpointID     *string `json:"endpoint_id"`
+	ConversationID *string        `json:"conversation_id"`
+	MessageID      *string        `json:"message_id"`
+	AppID          *string        `json:"app_id"`
+	EndpointID     *string        `json:"endpoint_id"`
+	Context        map[string]any `json:"context"`
 }
 
 func sessionKey(id string) string {
@@ -59,6 +60,7 @@ type NewSessionPayload struct {
 	MessageID              *string                                `json:"message_id"`
 	AppID                  *string                                `json:"app_id"`
 	EndpointID             *string                                `json:"endpoint_id"`
+	Context                map[string]any                         `json:"context"`
 }
 
 func NewSession(payload NewSessionPayload) *Session {
@@ -76,6 +78,7 @@ func NewSession(payload NewSessionPayload) *Session {
 		MessageID:              payload.MessageID,
 		AppID:                  payload.AppID,
 		EndpointID:             payload.EndpointID,
+		Context:                payload.Context,
 	}
 
 	session_lock.Lock()
@@ -172,6 +175,7 @@ func (s *Session) Message(event PLUGIN_IN_STREAM_EVENT, data any) []byte {
 		"message_id":      s.MessageID,
 		"app_id":          s.AppID,
 		"endpoint_id":     s.EndpointID,
+		"context":         s.Context,
 		"event":           event,
 		"data":            data,
 	})

internal/service/session.go

@@ -42,6 +42,7 @@ func createSession[T any](
 			MessageID:              r.MessageID,
 			AppID:                  r.AppID,
 			EndpointID:             r.EndpointID,
+			Context:                r.Context,
 		},
 	)
 

pkg/entities/plugin_entities/basic_type.go

@@ -35,6 +35,8 @@ func isBasicType(fl validator.FieldLevel) bool {
 		if fl.Field().IsNil() {
 			return true
 		}
+	default:
+		return false
 	}
 
 	return false

pkg/entities/plugin_entities/request.go

@@ -18,6 +18,7 @@ type InvokePluginRequest[T any] struct {
 	MessageID        *string                `json:"message_id"`
 	AppID            *string                `json:"app_id"`
 	EndpointID       *string                `json:"endpoint_id"`
+	Context          map[string]any         `json:"context"`
 
 	Data T `json:"data" validate:"required"`
 }

pkg/entities/plugin_entities/tool_declaration.go

@@ -221,7 +221,7 @@ func init() {
 type ToolProviderDeclaration struct {
 	Identity          ToolProviderIdentity `json:"identity" yaml:"identity" validate:"required"`
 	CredentialsSchema []ProviderConfig     `json:"credentials_schema" yaml:"credentials_schema" validate:"omitempty,dive"`
-	OAuthSchema       *OAuthSchema         `json:"oauth_schema" yaml:"oauth_schema" validate:"omitempty,dive"`
+	OAuthSchema       *OAuthSchema         `json:"oauth_schema" yaml:"oauth_schema" validate:"omitempty"`
 	Tools             []ToolDeclaration    `json:"tools" yaml:"tools" validate:"required,dive"`
 	ToolFiles         []string             `json:"-" yaml:"-"`
 }

pkg/entities/requests/model.go

@@ -7,7 +7,8 @@ import (
 )
 
 type Credentials struct {
-	Credentials map[string]any `json:"credentials" validate:"omitempty"`
+	Credentials    map[string]any `json:"credentials" validate:"omitempty"`
+	CredentialType string         `json:"credential_type" validate:"omitempty"`
 }
 
 type BaseRequestInvokeModel struct {

pkg/entities/requests/oauth.go

@@ -2,11 +2,13 @@ package requests
 
 type RequestOAuthGetAuthorizationURL struct {
 	Provider          string         `json:"provider" validate:"required"`
+	RedirectURI       string         `json:"redirect_uri" validate:"required"`
 	SystemCredentials map[string]any `json:"system_credentials" validate:"omitempty"`
 }
 
 type RequestOAuthGetCredentials struct {
 	Provider          string         `json:"provider" validate:"required"`
+	RedirectURI       string         `json:"redirect_uri" validate:"required"`
 	SystemCredentials map[string]any `json:"system_credentials" validate:"omitempty"`
 	RawHttpRequest    string         `json:"raw_http_request" validate:"required"` // hex encoded raw http request from the oauth provider
 }