Merge branch 'main' into release-1.16

Author: yaron2

.github/scripts/dapr_bot.js

@@ -1,32 +1,18 @@
 // list of owner who can control dapr-bot workflow
 // TODO: Read owners from OWNERS file.
 const owners = [
-    'addjuarez',
-    'amuluyavarote',
-    'artursouza',
+    'acroca',
     'berndverst',
+    'cicoyle',
     'daixiang0',
-    'DeepanshuA',
-    'elena-kolevska',
-    'halspang',
-    'ItalyPaleAle',
+    'javier-aliaga',
     'jjcollinge',
     'joshvanl',
     'mikeee',
     'msfussell',
-    'mukundansundar',
-    'pkedy',
-    'pravinpushkar',
-    'robertojrojas',
-    'RyanLettieri',
-    'shivamkm07',
-    'shubham1172',
+    'nelson-parente',
     'sicoyle',
-    'skyao',
-    'Taction',
-    'tmacam',
     'yaron2',
-    'yash-nisar',
 ]
 
 const docsIssueBodyTpl = (

bindings/sftp/sftp.go

@@ -173,6 +173,13 @@ func (sftp *Sftp) create(_ context.Context, req *bindings.InvokeRequest) (*bindi
 		return nil, fmt.Errorf("sftp binding error: error create file %s: %w", path, err)
 	}
 
+	defer func() {
+		closeErr := file.Close()
+		if closeErr != nil {
+			sftp.logger.Errorf("sftp binding error: error close file: %w", closeErr)
+		}
+	}()
+
 	_, err = file.Write(req.Data)
 	if err != nil {
 		return nil, fmt.Errorf("sftp binding error: error write file: %w", err)

bindings/sftp/sftp_integration_test.go

@@ -0,0 +1,82 @@
+package sftp
+
+import (
+	"encoding/json"
+	"os"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	"github.com/dapr/components-contrib/bindings"
+)
+
+var connectionStringEnvKey = "DAPR_TEST_SFTP_CONNSTRING"
+
+// Run docker from the file location as the upload folder is relative to the test
+// docker run -v ./upload:/home/foo/upload -p 2222:22 -d atmoz/sftp foo:pass:1001
+func TestIntegrationCases(t *testing.T) {
+	connectionString := os.Getenv(connectionStringEnvKey)
+	if connectionString == "" {
+		t.Skipf(`sftp binding integration tests skipped. To enable this test, define the connection string using environment variable '%[1]s' (example 'export %[1]s="localhost:2222")'`, connectionStringEnvKey)
+	}
+
+	t.Run("List operation", testListOperation)
+	t.Run("Create operation", testCreateOperation)
+}
+
+func testListOperation(t *testing.T) {
+	c := Sftp{}
+	m := bindings.Metadata{}
+	m.Properties = map[string]string{
+		"rootPath":              "/upload",
+		"address":               os.Getenv(connectionStringEnvKey),
+		"username":              "foo",
+		"password":              "pass",
+		"insecureIgnoreHostKey": "true",
+	}
+	err := c.Init(t.Context(), m)
+	require.NoError(t, err)
+
+	r, err := c.Invoke(t.Context(), &bindings.InvokeRequest{Operation: bindings.ListOperation})
+	require.NoError(t, err)
+	assert.NotNil(t, r.Data)
+
+	var d []listResponse
+	err = json.Unmarshal(r.Data, &d)
+	require.NoError(t, err)
+}
+
+func testCreateOperation(t *testing.T) {
+	c := Sftp{}
+	m := bindings.Metadata{}
+	m.Properties = map[string]string{
+		"rootPath":              "/upload",
+		"address":               os.Getenv(connectionStringEnvKey),
+		"username":              "foo",
+		"password":              "pass",
+		"insecureIgnoreHostKey": "true",
+	}
+
+	err := os.Remove("./upload/test.txt")
+	if err != nil && !os.IsNotExist(err) {
+		require.NoError(t, err)
+	}
+
+	err = c.Init(t.Context(), m)
+	require.NoError(t, err)
+
+	r, err := c.Invoke(t.Context(), &bindings.InvokeRequest{
+		Operation: bindings.CreateOperation,
+		Data:      []byte("test data 1"),
+		Metadata: map[string]string{
+			"fileName": "test.txt",
+		},
+	})
+	require.NoError(t, err)
+	assert.NotNil(t, r.Data)
+
+	file, err := os.Stat("./upload/test.txt")
+	require.NoError(t, err)
+	assert.Equal(t, "test.txt", file.Name())
+}

conversation/anthropic/anthropic.go

@@ -41,19 +41,15 @@ func NewAnthropic(logger logger.Logger) conversation.Conversation {
 	return a
 }
 
-const defaultModel = "claude-3-5-sonnet-20240620"
-
 func (a *Anthropic) Init(ctx context.Context, meta conversation.Metadata) error {
 	m := conversation.LangchainMetadata{}
 	err := kmeta.DecodeMetadata(meta.Properties, &m)
 	if err != nil {
 		return err
 	}
 
-	model := defaultModel
-	if m.Model != "" {
-		model = m.Model
-	}
+	// Resolve model via central helper (uses metadata, then env var, then default)
+	model := conversation.GetAnthropicModel(m.Model)
 
 	llm, err := anthropic.New(
 		anthropic.WithModel(model),

conversation/anthropic/metadata.yaml

@@ -24,10 +24,10 @@ metadata:
   - name: model
     required: false
     description: |
-      The Anthropic LLM to use.
+      The Anthropic LLM to use. Configurable via ANTHROPIC_MODEL environment variable.
     type: string
-    example: 'claude-3-5-sonnet-20240620'
-    default: 'claude-3-5-sonnet-20240620'
+    example: 'claude-sonnet-4-20250514'
+    default: 'claude-sonnet-4-20250514'
   - name: cacheTTL
     required: false
     description: |

conversation/googleai/googleai.go

@@ -41,19 +41,15 @@ func NewGoogleAI(logger logger.Logger) conversation.Conversation {
 	return g
 }
 
-const defaultModel = "gemini-2.5-flash"
-
 func (g *GoogleAI) Init(ctx context.Context, meta conversation.Metadata) error {
 	md := conversation.LangchainMetadata{}
 	err := kmeta.DecodeMetadata(meta.Properties, &md)
 	if err != nil {
 		return err
 	}
 
-	model := defaultModel
-	if md.Model != "" {
-		model = md.Model
-	}
+	// Resolve model via central helper (uses metadata, then env var, then default)
+	model := conversation.GetGoogleAIModel(md.Model)
 
 	opts := []openai.Option{
 		openai.WithModel(model),

conversation/googleai/metadata.yaml

@@ -24,10 +24,10 @@ metadata:
   - name: model
     required: false
     description: |
-      The GoogleAI LLM to use.
+      The GoogleAI LLM to use. Configurable via GOOGLEAI_MODEL environment variable.
     type: string
-    example: 'gemini-2.5-flash'
-    default: 'gemini-2.5-flash'
+    example: 'gemini-2.5-flash-lite'
+    default: 'gemini-2.5-flash-lite'
   - name: cacheTTL
     required: false
     description: |

conversation/huggingface/huggingface.go

@@ -42,9 +42,6 @@ func NewHuggingface(logger logger.Logger) conversation.Conversation {
 	return h
 }
 
-// Default model - using a popular and reliable model
-const defaultModel = "deepseek-ai/DeepSeek-R1-Distill-Qwen-32B"
-
 // Default HuggingFace OpenAI-compatible endpoint
 const defaultEndpoint = "https://router.huggingface.co/hf-inference/models/{{model}}/v1"
 
@@ -55,10 +52,8 @@ func (h *Huggingface) Init(ctx context.Context, meta conversation.Metadata) erro
 		return err
 	}
 
-	model := defaultModel
-	if m.Model != "" {
-		model = m.Model
-	}
+	// Resolve model via central helper (uses metadata, then env var, then default)
+	model := conversation.GetHuggingFaceModel(m.Model)
 
 	endpoint := strings.Replace(defaultEndpoint, "{{model}}", model, 1)
 	if m.Endpoint != "" {

conversation/huggingface/metadata.yaml

@@ -24,7 +24,7 @@ metadata:
   - name: model
     required: false
     description: |
-      The Huggingface model to use. Uses OpenAI-compatible API.
+      The Huggingface model to use. Uses OpenAI-compatible API. Configurable via HUGGINGFACE_MODEL environment variable.
     type: string
     example: 'deepseek-ai/DeepSeek-R1-Distill-Qwen-32B'
     default: 'deepseek-ai/DeepSeek-R1-Distill-Qwen-32B'

conversation/metadata_test.go

@@ -25,7 +25,7 @@ func TestLangchainMetadata(t *testing.T) {
 	t.Run("json marshaling with endpoint", func(t *testing.T) {
 		metadata := LangchainMetadata{
 			Key:      "test-key",
-			Model:    "gpt-4",
+			Model:    DefaultOpenAIModel,
 			CacheTTL: "10m",
 			Endpoint: "https://custom-endpoint.example.com",
 		}