support both yaml and yml postfix

src/promptflow-core/promptflow/_utils/flow_utils.py

@@ -2,6 +2,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # ---------------------------------------------------------
 import hashlib
+import itertools
 import json
 import os
 import re
@@ -87,13 +88,19 @@ def resolve_flow_path(
 
     if flow_path.is_dir():
         flow_folder = flow_path
-        dag_file_exist = (flow_folder / FLOW_DAG_YAML).is_file()
-        flex_file_exist = (flow_folder / FLOW_FLEX_YAML).is_file()
-        flow_file = FLOW_FLEX_YAML if flex_file_exist else FLOW_DAG_YAML
-        if dag_file_exist and flex_file_exist:
+        flow_file = FLOW_DAG_YAML
+        flow_file_list = []
+        for flow_name, suffix in itertools.product([FLOW_DAG_YAML, FLOW_FLEX_YAML], [".yaml", ".yml"]):
+            flow_file_name = flow_name.replace(".yaml", suffix)
+            if (flow_folder / flow_file_name).is_file():
+                flow_file_list.append(flow_file_name)
+
+        if len(flow_file_list) == 1:
+            flow_file = flow_file_list[0]
+        elif len(flow_file_list) > 1:
             raise ValidationException(
-                f"Both {FLOW_DAG_YAML} and {FLOW_FLEX_YAML} exist in {flow_path}. "
-                f"Please specify a file or remove the extra YAML.",
+                f"Multiple files {', '.join(flow_file_list)} exist in {flow_path}. "
+                f"Please specify a file or remove the extra YAML file.",
                 privacy_info=[str(flow_path)],
             )
     elif flow_path.is_file() or flow_path.suffix.lower() in FLOW_FILE_SUFFIX:

src/promptflow/tests/sdk_cli_test/e2etests/test_flow_test.py

@@ -279,6 +279,12 @@ def test_eager_flow_test_with_yaml(self):
         result = _client._flows._test(flow=flow_path, inputs={"input_val": "val1"})
         assert result.run_info.status.value == "Completed"
 
+    def test_eager_flow_test_with_yml(self):
+        clear_module_cache("entry")
+        flow_path = Path(f"{EAGER_FLOWS_DIR}/simple_with_yml/").absolute()
+        result = _client._flows._test(flow=flow_path, inputs={"input_val": "val1"})
+        assert result.run_info.status.value == "Completed"
+
     def test_eager_flow_test_with_primitive_output(self):
         clear_module_cache("entry")
         flow_path = Path(f"{EAGER_FLOWS_DIR}/primitive_output/").absolute()

src/promptflow/tests/sdk_cli_test/unittests/test_flow.py

@@ -71,7 +71,13 @@ def test_multiple_flow_load(self):
         with pytest.raises(ValidationException) as e:
             load_flow(EAGER_FLOWS_DIR / "multiple_flow_yaml")
 
-        assert "Both flow.dag.yaml and flow.flex.yaml exist in " in str(e.value)
+        assert "Multiple files flow.dag.yaml, flow.flex.yaml exist in " in str(e.value)
+
+    def test_multiple_flex_load(self):
+        with pytest.raises(ValidationException) as e:
+            load_flow(EAGER_FLOWS_DIR / "multiple_flex_yaml")
+
+        assert "Multiple files flow.flex.yaml, flow.flex.yml exist in " in str(e.value)
 
     def test_specify_flow_load(self):
         load_flow(EAGER_FLOWS_DIR / "multiple_flow_yaml" / "flow.dag.yaml")

src/promptflow/tests/test_configs/eager_flows/multiple_flex_yaml/flow.flex.yml

@@ -0,0 +1 @@
+entry: entry:my_flow

src/promptflow/tests/test_configs/eager_flows/simple_with_yml/entry.py

@@ -0,0 +1,7 @@
+# ---------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# ---------------------------------------------------------
+
+def my_flow(input_val: str = "gpt") -> str:
+    """Simple flow without yaml."""
+    return f"Hello world! {input_val}"

src/promptflow/tests/test_configs/eager_flows/simple_with_yml/flow.flex.yml

@@ -0,0 +1 @@
+entry: entry:my_flow