clean up stderr out on tests, use Node.findall in docstring parser

examples/flows/integrations/azure-ai-language/analyze_conversations/peek_text.py

@@ -1,4 +1,4 @@
-from promptflow import tool
+from promptflow.core import tool
 
 
 @tool

scripts/tool/templates/tool.py.j2

@@ -1,4 +1,4 @@
-from promptflow import tool
+from promptflow.core import tool
 from promptflow.connections import CustomConnection
 
 

scripts/tool/templates/tool2.py.j2

@@ -1,4 +1,4 @@
-from promptflow import ToolProvider, tool
+from promptflow.core import ToolProvider, tool
 import urllib.request
 
 

src/promptflow-core/promptflow/executor/_docstring_parser.py

@@ -15,7 +15,7 @@ def parse_description(docstring: str):
  found_param_or_type = False
 
  # Traverse the document tree to process nodes
- for node in doctree.traverse():
+ for node in doctree.findall():
  if isinstance(node, docutils.nodes.field):
  found_param_or_type = True # Mark when we encounter parameter or type fields
  field_name = node.children[0].astext().strip()

src/promptflow-tools/promptflow/tools/azure_content_safety.py

@@ -3,7 +3,7 @@
 import json
 import requests
 
-from promptflow import tool, ToolProvider
+from promptflow.core import tool, ToolProvider
 from promptflow.connections import AzureContentSafetyConnection
 from promptflow.tools.exception import AzureContentSafetyInputValueError, AzureContentSafetySystemError
 

src/promptflow/tests/executor/package_tools/communicate.py

@@ -1,4 +1,4 @@
-from promptflow import ToolProvider, tool
+from promptflow.core import ToolProvider, tool
 from promptflow.core._connection import AzureOpenAIConnection
 
 

src/promptflow/tests/executor/package_tools/custom_llm_tool.py

@@ -1,8 +1,8 @@
 from jinja2 import Template
 
-from promptflow import ToolProvider, tool
 from promptflow.connections import AzureOpenAIConnection
 from promptflow.contracts.types import PromptTemplate
+from promptflow.core import ToolProvider, tool
 
 
 class TestCustomLLMTool(ToolProvider):

src/promptflow/tests/executor/package_tools/tool_with_connection.py

@@ -1,8 +1,8 @@
 from dataclasses import dataclass
 
-from promptflow import tool
 from promptflow._core.tools_manager import register_connections
 from promptflow.contracts.types import Secret
+from promptflow.core import tool
 
 
 @dataclass

src/promptflow/tests/executor/package_tools/tool_with_init_error.py

@@ -1,4 +1,4 @@
-from promptflow import ToolProvider, tool
+from promptflow.core import ToolProvider, tool
 
 
 class TestLoadErrorTool(ToolProvider):

src/promptflow/tests/executor/unittests/_core/test_tool.py

@@ -2,8 +2,8 @@
 
 import pytest
 
-from promptflow import tool
 from promptflow._core.tool import InputSetting, ToolType
+from promptflow.core import tool
 from promptflow.exceptions import UserErrorException
 from promptflow.tracing._tracer import Tracer
 from promptflow.tracing.contracts.trace import TraceType

src/promptflow/tests/executor/unittests/_core/test_tools_manager.py

@@ -7,7 +7,6 @@
 import pytest
 from mock import MagicMock
 
-from promptflow import tool
 from promptflow._core._errors import InputTypeMismatch, InvalidSource, PackageToolNotFoundError
 from promptflow._core.tools_manager import (
  BuiltinsManager,
@@ -18,6 +17,7 @@
 from promptflow._utils.yaml_utils import load_yaml_string
 from promptflow.contracts.flow import InputAssignment, InputValueType, Node, ToolSource, ToolSourceType
 from promptflow.contracts.tool import Tool, ToolFuncCallScenario, ToolType
+from promptflow.core import tool
 from promptflow.exceptions import UserErrorException
 
 

src/promptflow/tests/executor/unittests/executor/assistant_sample_tool.py

@@ -1,5 +1,5 @@
-from promptflow import tool
 from promptflow.connections import AzureOpenAIConnection
+from promptflow.core import tool
 
 
 @tool

src/promptflow/tests/executor/unittests/executor/test_flow_executor.py

@@ -2,10 +2,9 @@
 
 import pytest
 
-from promptflow import tool
 from promptflow.contracts.flow import FlowInputDefinition
 from promptflow.contracts.tool import ValueType
-
+from promptflow.core import tool
 from promptflow.executor.flow_executor import (
  FlowExecutor,
  _ensure_node_result_is_serializable,

src/promptflow/tests/test_configs/assistant_definitions/echo.py

@@ -1,4 +1,4 @@
-from promptflow import tool
+from promptflow.core import tool
 from promptflow.connections import AzureOpenAIConnection
 
 

src/promptflow/tests/test_configs/assistant_definitions/echo_with_partial_description.py

@@ -1,4 +1,4 @@
-from promptflow import tool
+from promptflow.core import tool
 from promptflow.connections import AzureOpenAIConnection
 
 

src/promptflow/tests/test_configs/eager_flows/multiple_flow_yaml/hello_world.py

@@ -1,4 +1,4 @@
-from promptflow import tool
+from promptflow.core import tool
 
 
 @tool

src/promptflow/tests/test_configs/flows/chat_group/cloud_batch_runs/chat_group_simulation/simulator.py

@@ -1,7 +1,7 @@
 import uuid
 from typing import List
 
-from promptflow import tool
+from promptflow.core import tool
 
 
 def get_question_from_conversation_history(conversation_history: List, question: str) -> str:

src/promptflow/tests/test_configs/flows/chat_group/cloud_batch_runs/chat_group_simulation_error/simulator.py

@@ -1,7 +1,7 @@
 import uuid
 from typing import List
 
-from promptflow import tool
+from promptflow.core import tool
 
 
 @tool

src/promptflow/tests/test_configs/flows/chat_group/cloud_batch_runs/chat_group_simulation_stop_signal/simulator.py

@@ -1,7 +1,7 @@
 import uuid
 from typing import List
 
-from promptflow import tool
+from promptflow.core import tool
 
 
 def get_question_from_conversation_history(conversation_history: List, question: str) -> str:

src/promptflow/tests/test_configs/flows/eval_flow_with_image_resume_random_fail/count_image.py

@@ -1,5 +1,5 @@
 from typing import List
-from promptflow import tool
+from promptflow.core import tool
 from promptflow.contracts.multimedia import Image
 
 

src/promptflow/tests/test_configs/flows/eval_flow_with_image_resume_random_fail/flip_image.py

@@ -1,7 +1,7 @@
 import io
 import random
 from pathlib import Path
-from promptflow import tool
+from promptflow.core import tool
 from promptflow.contracts.multimedia import Image
 from PIL import Image as PIL_Image
 

src/promptflow/tests/test_configs/flows/python_tool_with_openai_vision_image/pick_an_image.py

@@ -1,7 +1,7 @@
 import random
 
 from promptflow.contracts.multimedia import Image
-from promptflow import tool
+from promptflow.core import tool
 
 
 @tool

src/promptflow/tests/test_configs/flows/web_classification_random_fail/convert_to_dict.py

@@ -1,6 +1,6 @@
 import json
 
-from promptflow import tool
+from promptflow.core import tool
 
 
 @tool

src/promptflow/tests/test_configs/flows/web_classification_random_fail/fetch_text_content_from_url.py

@@ -1,7 +1,6 @@
 import bs4
 import requests
-import random
-from promptflow import tool
+from promptflow.core import tool
 
 
 @tool

src/promptflow/tests/test_configs/flows/web_classification_random_fail/prepare_examples.py

@@ -1,4 +1,4 @@
-from promptflow import tool
+from promptflow.core import tool
 
 
 @tool

src/promptflow/tests/test_configs/flows/web_classification_random_fail/random_fail.py

@@ -1,5 +1,5 @@
 
-from promptflow import tool
+from promptflow.core import tool
 import random
 
 # The inputs section will change based on the arguments of the tool function, after you save the code