refactor: rename _utility to _utilities

scripts/installer/windows/scripts/generate_dependency.py

@@ -4,7 +4,7 @@
 import copy
 from pip._vendor import tomli as toml
 from pathlib import Path
-from promptflow._sdk._utility.general_utils import render_jinja_template
+from promptflow._sdk._utilities.general_utils import render_jinja_template
 
 
 def get_git_base_dir():

src/promptflow-azure/promptflow/azure/_cli/_run.py

@@ -28,7 +28,7 @@
 )
 from promptflow._sdk._constants import MAX_SHOW_DETAILS_RESULTS, ListViewType
 from promptflow._sdk._errors import InvalidRunStatusError
-from promptflow._sdk._utility.general_utils import print_red_error
+from promptflow._sdk._utilities.general_utils import print_red_error
 from promptflow.azure._cli._utils import _get_azure_pf_client
 from promptflow.azure._restclient.flow_service_caller import FlowRequestException
 

src/promptflow-azure/promptflow/azure/_cli/entry.py

@@ -16,7 +16,10 @@
 import logging  # noqa: E402
 import sys  # noqa: E402
 
-from promptflow._sdk._utility.general_utils import print_pf_version, print_promptflow_version_dict_string  # noqa: E402
+from promptflow._sdk._utilities.general_utils import (  # noqa: E402
+    print_pf_version,
+    print_promptflow_version_dict_string,
+)
 from promptflow._utils.logger_utils import get_cli_sdk_logger  # noqa: E402
 from promptflow._utils.user_agent_utils import setup_user_agent_to_operation_context  # noqa: E402
 from promptflow.azure._cli._flow import add_parser_flow, dispatch_flow_commands  # noqa: E402

src/promptflow-azure/promptflow/azure/_entities/_flow.py

@@ -13,8 +13,8 @@
 from promptflow._constants import FlowLanguage
 from promptflow._proxy import ProxyFactory
 from promptflow._sdk._constants import SERVICE_FLOW_TYPE_2_CLIENT_FLOW_TYPE, AzureFlowSource, FlowType
-from promptflow._sdk._utility.general_utils import PromptflowIgnoreFile, load_yaml, remove_empty_element_from_dict
-from promptflow._sdk._utility.signature_utils import update_signatures
+from promptflow._sdk._utilities.general_utils import PromptflowIgnoreFile, load_yaml, remove_empty_element_from_dict
+from promptflow._sdk._utilities.signature_utils import update_signatures
 from promptflow._utils.flow_utils import dump_flow_dag, load_flow_dag, resolve_flow_path
 from promptflow._utils.logger_utils import LoggerFactory
 from promptflow.azure._ml import AdditionalIncludesMixin, Code
@@ -180,7 +180,7 @@ def _get_all_additional_includes_configs(self) -> List:
         """Get all additional include configs.
         For flow, its additional include need to be read from dag with a helper function.
         """
-        from promptflow._sdk._utility.general_utils import _get_additional_includes
+        from promptflow._sdk._utilities.general_utils import _get_additional_includes
 
         return _get_additional_includes(os.path.join(self.code, self.path))
 

src/promptflow-azure/promptflow/azure/_pf_client.py

@@ -10,7 +10,7 @@
 
 from promptflow._sdk._constants import MAX_SHOW_DETAILS_RESULTS
 from promptflow._sdk._errors import RunOperationParameterError
-from promptflow._sdk._utility.general_utils import generate_yaml_entry
+from promptflow._sdk._utilities.general_utils import generate_yaml_entry
 from promptflow._sdk.entities import Run
 from promptflow._utils.user_agent_utils import ClientUserAgentUtil, setup_user_agent_to_operation_context
 from promptflow.azure._restclient.service_caller_factory import _FlowServiceCallerFactory

src/promptflow-azure/promptflow/azure/_storage/cosmosdb/summary.py

@@ -19,7 +19,7 @@
     SPAN_EVENTS_NAME_PF_OUTPUT,
     TRACE_DEFAULT_COLLECTION,
 )
-from promptflow._sdk._utility.general_utils import json_loads_parse_const_as_str
+from promptflow._sdk._utilities.general_utils import json_loads_parse_const_as_str
 from promptflow._sdk.entities._trace import Span
 from promptflow.azure._storage.cosmosdb.cosmosdb_utils import safe_create_cosmosdb_item
 

src/promptflow-azure/promptflow/azure/_utils/_tracing.py

@@ -10,7 +10,7 @@
 from azure.identity import AzureCliCredential
 
 from promptflow._constants import AzureWorkspaceKind, CosmosDBContainerName
-from promptflow._sdk._utility.general_utils import extract_workspace_triad_from_trace_provider
+from promptflow._sdk._utilities.general_utils import extract_workspace_triad_from_trace_provider
 from promptflow._utils.logger_utils import get_cli_sdk_logger
 from promptflow.azure import PFClient
 from promptflow.azure._restclient.flow_service_caller import FlowRequestException

src/promptflow-azure/promptflow/azure/operations/_artifact_client.py

@@ -6,7 +6,7 @@
 import httpx
 
 from promptflow._sdk._errors import ArtifactInternalError, SDKError, UserAuthenticationError
-from promptflow._sdk._utility.general_utils import get_promptflow_sdk_version
+from promptflow._sdk._utilities.general_utils import get_promptflow_sdk_version
 from promptflow._utils.logger_utils import get_cli_sdk_logger
 from promptflow.azure._utils.general import get_authorization
 

src/promptflow-azure/promptflow/azure/operations/_connection_operations.py

@@ -10,7 +10,7 @@
     _ScopeDependentOperations,
 )
 
-from promptflow._sdk._utility.general_utils import safe_parse_object_list
+from promptflow._sdk._utilities.general_utils import safe_parse_object_list
 from promptflow._sdk.entities._connection import _Connection
 from promptflow._utils.logger_utils import get_cli_sdk_logger
 from promptflow.azure._entities._workspace_connection_spec import WorkspaceConnectionSpec

src/promptflow-azure/promptflow/azure/operations/_flow_operations.py

@@ -35,7 +35,7 @@
 )
 from promptflow._sdk._errors import FlowOperationError
 from promptflow._sdk._telemetry import ActivityType, WorkspaceTelemetryMixin, monitor_operation
-from promptflow._sdk._utility.general_utils import PromptflowIgnoreFile
+from promptflow._sdk._utilities.general_utils import PromptflowIgnoreFile
 from promptflow._sdk._vendor._asset_utils import traverse_directory
 from promptflow._utils.flow_utils import resolve_flow_path
 from promptflow._utils.logger_utils import get_cli_sdk_logger

src/promptflow-azure/promptflow/azure/operations/_run_operations.py

@@ -45,7 +45,7 @@
 )
 from promptflow._sdk._errors import InvalidRunStatusError, RunNotFoundError, RunOperationParameterError
 from promptflow._sdk._telemetry import ActivityType, WorkspaceTelemetryMixin, monitor_operation
-from promptflow._sdk._utility.general_utils import (
+from promptflow._sdk._utilities.general_utils import (
     incremental_print,
     is_multi_container_enabled,
     is_remote_uri,

src/promptflow-azure/tests/sdk_cli_azure_test/e2etests/test_telemetry.py

@@ -31,7 +31,7 @@
     log_activity,
 )
 from promptflow._sdk._telemetry.logging_handler import get_promptflow_sdk_log_handler
-from promptflow._sdk._utility.general_utils import call_from_extension
+from promptflow._sdk._utilities.general_utils import call_from_extension
 from promptflow._utils.user_agent_utils import ClientUserAgentUtil
 from promptflow._utils.utils import environment_variable_overwrite, parse_ua_to_dict
 from promptflow.tracing._operation_context import OperationContext

src/promptflow-azure/tests/sdk_cli_azure_test/unittests/test_flow_entity.py

@@ -13,7 +13,7 @@
 from sdk_cli_azure_test.conftest import EAGER_FLOWS_DIR, FLOWS_DIR
 
 from promptflow import load_run
-from promptflow._sdk._utility.signature_utils import update_signatures
+from promptflow._sdk._utilities.signature_utils import update_signatures
 from promptflow._sdk._vendor import get_upload_files_from_folder
 from promptflow._utils.flow_utils import load_flow_dag
 from promptflow.azure._constants._flow import ENVIRONMENT, PYTHON_REQUIREMENTS_TXT

src/promptflow-azure/tests/sdk_cli_azure_test/unittests/test_run_operations.py

@@ -9,7 +9,7 @@
 from sdk_cli_azure_test.conftest import DATAS_DIR, EAGER_FLOWS_DIR, FLOWS_DIR
 
 from promptflow._sdk._errors import RunOperationParameterError, UploadUserError, UserAuthenticationError
-from promptflow._sdk._utility.tracing_utils import _parse_otel_span_status_code
+from promptflow._sdk._utilities.tracing_utils import _parse_otel_span_status_code
 from promptflow._sdk.entities import Run
 from promptflow._sdk.operations._run_operations import RunOperations
 from promptflow._utils.async_utils import async_run_allowing_running_loop

src/promptflow-devkit/CHANGELOG.md

@@ -5,6 +5,9 @@
 ### Improvements
 - Interactive browser credential is excluded by default when using Azure AI connections, user could set `PF_NO_INTERACTIVE_LOGIN=False` to enable it.
 
+### Bugs Fixed
+- Fix the issue that import error will be raised after downgrading promptflow from >=1.10.0 to <1.8.0.
+
 ## v1.10.0 (2024.04.26)
 
 ### Features Added

src/promptflow-devkit/promptflow/_cli/_params.py

@@ -6,7 +6,7 @@
 
 from promptflow._cli._completers._param_completers import run_name_completer
 from promptflow._sdk._constants import PROMPT_FLOW_DIR_NAME, PROMPT_FLOW_RUNS_DIR_NAME, CLIListOutputFormat, FlowType
-from promptflow._sdk._utility.general_utils import load_input_data
+from promptflow._sdk._utilities.general_utils import load_input_data
 
 # TODO: avoid azure dependency here
 MAX_LIST_CLI_RESULTS = 50

src/promptflow-devkit/promptflow/_cli/_pf/_config.py

@@ -4,7 +4,7 @@
 from promptflow._cli._params import add_param_path, add_param_set_positional, base_params
 from promptflow._cli._utils import activate_action, list_of_dict_to_dict
 from promptflow._sdk._configuration import Configuration, InvalidConfigValue
-from promptflow._sdk._utility.general_utils import print_red_error
+from promptflow._sdk._utilities.general_utils import print_red_error
 from promptflow._utils.logger_utils import get_cli_sdk_logger
 
 logger = get_cli_sdk_logger()

src/promptflow-devkit/promptflow/_cli/_pf/_flow.py

@@ -41,9 +41,9 @@
 from promptflow._sdk._configuration import Configuration
 from promptflow._sdk._constants import PROMPT_FLOW_DIR_NAME
 from promptflow._sdk._pf_client import PFClient
-from promptflow._sdk._utility.chat_utils import construct_chat_page_url
-from promptflow._sdk._utility.general_utils import generate_yaml_entry_without_recover
-from promptflow._sdk._utility.serve_utils import start_flow_service
+from promptflow._sdk._utilities.chat_utils import construct_chat_page_url
+from promptflow._sdk._utilities.general_utils import generate_yaml_entry_without_recover
+from promptflow._sdk._utilities.serve_utils import start_flow_service
 from promptflow._utils.flow_utils import is_flex_flow
 from promptflow._utils.logger_utils import get_cli_sdk_logger
 from promptflow.exceptions import ErrorTarget, UserErrorException

src/promptflow-devkit/promptflow/_cli/_pf/_run.py

@@ -35,7 +35,7 @@
 from promptflow._sdk._load_functions import load_run
 from promptflow._sdk._pf_client import PFClient
 from promptflow._sdk._run_functions import _create_run, _resume_run
-from promptflow._sdk._utility.general_utils import generate_yaml_entry, safe_parse_object_list
+from promptflow._sdk._utilities.general_utils import generate_yaml_entry, safe_parse_object_list
 from promptflow._sdk.entities import Run
 from promptflow._utils.logger_utils import get_cli_sdk_logger
 from promptflow.exceptions import UserErrorException

src/promptflow-devkit/promptflow/_cli/_pf/_service.py

@@ -35,7 +35,7 @@
     is_run_from_built_binary,
     kill_exist_service,
 )
-from promptflow._sdk._utility.general_utils import add_executable_script_to_env_path
+from promptflow._sdk._utilities.general_utils import add_executable_script_to_env_path
 from promptflow._utils.logger_utils import get_cli_sdk_logger  # noqa: E402
 from promptflow.exceptions import UserErrorException
 

src/promptflow-devkit/promptflow/_cli/_pf/_upgrade.py

@@ -41,7 +41,7 @@ def upgrade_version(args):
     from packaging.version import parse
 
     from promptflow._constants import _ENV_PF_INSTALLER, CLI_PACKAGE_NAME
-    from promptflow._sdk._utility.general_utils import get_promptflow_sdk_version
+    from promptflow._sdk._utilities.general_utils import get_promptflow_sdk_version
     from promptflow._sdk._version_hint_utils import get_latest_version
 
     installer = os.getenv(_ENV_PF_INSTALLER) or ""

src/promptflow-devkit/promptflow/_cli/_pf/entry.py

@@ -32,7 +32,10 @@
 from promptflow._cli._pf._upgrade import add_upgrade_parser, upgrade_version  # noqa: E402
 from promptflow._cli._pf.help import show_privacy_statement, show_welcome_message  # noqa: E402
 from promptflow._cli._user_agent import USER_AGENT  # noqa: E402
-from promptflow._sdk._utility.general_utils import print_pf_version, print_promptflow_version_dict_string  # noqa: E402
+from promptflow._sdk._utilities.general_utils import (  # noqa: E402
+    print_pf_version,
+    print_promptflow_version_dict_string,
+)
 from promptflow._utils.logger_utils import get_cli_sdk_logger  # noqa: E402
 from promptflow._utils.user_agent_utils import setup_user_agent_to_operation_context  # noqa: E402
 

src/promptflow-devkit/promptflow/_cli/_utils.py

@@ -20,7 +20,7 @@
 
 from promptflow._sdk._constants import DEFAULT_ENCODING, AzureMLWorkspaceTriad, CLIListOutputFormat
 from promptflow._sdk._telemetry import ActivityType, get_telemetry_logger, log_activity
-from promptflow._sdk._utility.general_utils import print_red_error, print_yellow_warning
+from promptflow._sdk._utilities.general_utils import print_red_error, print_yellow_warning
 from promptflow._utils.exception_utils import ExceptionPresenter
 from promptflow._utils.logger_utils import get_cli_sdk_logger
 from promptflow.exceptions import PromptflowException, UserErrorException

src/promptflow-devkit/promptflow/_internal/__init__.py

@@ -51,7 +51,7 @@
 from promptflow._sdk._constants import LOCAL_MGMT_DB_PATH, CreatedByFieldName
 from promptflow._sdk._service.apis.collector import trace_collector
 from promptflow._sdk._tracing import process_otlp_trace_request
-from promptflow._sdk._utility.general_utils import resolve_flow_language
+from promptflow._sdk._utilities.general_utils import resolve_flow_language
 from promptflow._sdk._version import VERSION
 from promptflow._utils.context_utils import _change_working_dir, inject_sys_path
 from promptflow._utils.credential_scrubber import CredentialScrubber

src/promptflow-devkit/promptflow/_proxy/_python_executor_proxy.py

@@ -9,7 +9,7 @@
 from promptflow._core._errors import UnexpectedError
 from promptflow._core.run_tracker import RunTracker
 from promptflow._sdk._constants import FLOW_META_JSON_GEN_TIMEOUT, FLOW_TOOLS_JSON_GEN_TIMEOUT
-from promptflow._sdk._utility.general_utils import can_accept_kwargs
+from promptflow._sdk._utilities.general_utils import can_accept_kwargs
 from promptflow._utils.flow_utils import resolve_python_entry_file
 from promptflow._utils.logger_utils import bulk_logger
 from promptflow._utils.yaml_utils import load_yaml
@@ -138,7 +138,7 @@ def _generate_flow_tools_json(
         timeout: int = FLOW_TOOLS_JSON_GEN_TIMEOUT,
         load_in_subprocess: bool = True,
     ) -> dict:
-        from promptflow._sdk._utility.general_utils import generate_flow_tools_json
+        from promptflow._sdk._utilities.general_utils import generate_flow_tools_json
 
         return generate_flow_tools_json(
             flow_directory=working_dir,

src/promptflow-devkit/promptflow/_sdk/_configuration.py

@@ -18,7 +18,7 @@
     HOME_PROMPT_FLOW_DIR,
     SERVICE_CONFIG_FILE,
 )
-from promptflow._sdk._utility.general_utils import call_from_extension, gen_uuid_by_compute_info, read_write_by_user
+from promptflow._sdk._utilities.general_utils import call_from_extension, gen_uuid_by_compute_info, read_write_by_user
 from promptflow._utils.logger_utils import get_cli_sdk_logger
 from promptflow._utils.yaml_utils import dump_yaml, load_yaml
 from promptflow.exceptions import ErrorTarget, ValidationException

src/promptflow-devkit/promptflow/_sdk/_mlflow.py

@@ -7,7 +7,7 @@
 """
 from promptflow._constants import FLOW_DAG_YAML as DAG_FILE_NAME
 from promptflow._sdk._orchestrator import remove_additional_includes
-from promptflow._sdk._utility.general_utils import _merge_local_code_and_additional_includes
+from promptflow._sdk._utilities.general_utils import _merge_local_code_and_additional_includes
 from promptflow._sdk.entities._flows import Flow
 from promptflow.core._serving.flow_invoker import FlowInvoker
 

src/promptflow-devkit/promptflow/_sdk/_orchestrator/experiment_orchestrator.py

@@ -53,7 +53,7 @@
 from promptflow._sdk._orm.experiment_node_run import ExperimentNodeRun as ORMExperimentNodeRun
 from promptflow._sdk._orm.orchestrator import Orchestrator as ORMOrchestrator
 from promptflow._sdk._orm.run_info import RunInfo as ORMRunInfo
-from promptflow._sdk._utility.general_utils import overwrite_null_std_logger
+from promptflow._sdk._utilities.general_utils import overwrite_null_std_logger
 from promptflow._sdk.entities import Run
 from promptflow._sdk.entities._experiment import Experiment, ExperimentTemplate
 from promptflow._sdk.operations import RunOperations

src/promptflow-devkit/promptflow/_sdk/_orchestrator/test_submitter.py

@@ -15,7 +15,7 @@
 from promptflow._internal import ConnectionManager
 from promptflow._proxy import ProxyFactory
 from promptflow._sdk._constants import PROMPT_FLOW_DIR_NAME
-from promptflow._sdk._utility.general_utils import get_flow_name, get_flow_path
+from promptflow._sdk._utilities.general_utils import get_flow_name, get_flow_path
 from promptflow._sdk.entities._flows import Flow, FlowContext, Prompty
 from promptflow._sdk.operations._local_storage_operations import LoggerOperations
 from promptflow._utils.async_utils import async_run_allowing_running_loop

src/promptflow-devkit/promptflow/_sdk/_orchestrator/utils.py

@@ -40,7 +40,7 @@
 )
 from promptflow._sdk._errors import InvalidFlowError, RunOperationError
 from promptflow._sdk._load_functions import load_flow
-from promptflow._sdk._utility.general_utils import _merge_local_code_and_additional_includes
+from promptflow._sdk._utilities.general_utils import _merge_local_code_and_additional_includes
 from promptflow._sdk.entities._flows import FlexFlow, Flow, Prompty
 from promptflow._utils.flow_utils import dump_flow_dag, load_flow_dag
 from promptflow._utils.logger_utils import FileHandler, get_cli_sdk_logger

src/promptflow-devkit/promptflow/_sdk/_orm/session.py

@@ -31,7 +31,7 @@
     TRACE_MGMT_DB_PATH,
     TRACE_MGMT_DB_SESSION_ACQUIRE_LOCK_PATH,
 )
-from promptflow._sdk._utility.general_utils import (
+from promptflow._sdk._utilities.general_utils import (
     get_promptflow_sdk_version,
     print_red_error,
     print_yellow_warning,

src/promptflow-devkit/promptflow/_sdk/_pf_client.py

@@ -17,7 +17,7 @@
 from ._constants import MAX_SHOW_DETAILS_RESULTS
 from ._load_functions import load_flow
 from ._user_agent import USER_AGENT
-from ._utility.general_utils import generate_yaml_entry
+from ._utilities.general_utils import generate_yaml_entry
 from .entities import Run
 from .entities._flows import FlexFlow, Prompty
 from .entities._flows.base import FlowBase

src/promptflow-devkit/promptflow/_sdk/_service/apis/ui.py

@@ -14,7 +14,7 @@
 from promptflow._sdk._constants import DEFAULT_ENCODING, PROMPT_FLOW_DIR_NAME, UX_INPUTS_JSON
 from promptflow._sdk._service import Namespace, Resource, fields
 from promptflow._sdk._service.utils.utils import decrypt_flow_path
-from promptflow._sdk._utility.general_utils import json_load, read_write_by_user
+from promptflow._sdk._utilities.general_utils import json_load, read_write_by_user
 from promptflow._utils.flow_utils import resolve_flow_path
 from promptflow._utils.yaml_utils import dump_yaml, load_yaml, load_yaml_string
 from promptflow.exceptions import UserErrorException

src/promptflow-devkit/promptflow/_sdk/_service/app.py

@@ -39,7 +39,7 @@
     is_run_from_built_binary,
     kill_exist_service,
 )
-from promptflow._sdk._utility.general_utils import overwrite_null_std_logger
+from promptflow._sdk._utilities.general_utils import overwrite_null_std_logger
 from promptflow._utils.thread_utils import ThreadWithContextVars
 
 overwrite_null_std_logger()

src/promptflow-devkit/promptflow/_sdk/_service/utils/utils.py

@@ -31,7 +31,7 @@
     PF_SERVICE_PORT_FILE,
 )
 from promptflow._sdk._errors import ConnectionNotFoundError, RunNotFoundError
-from promptflow._sdk._utility.general_utils import (
+from promptflow._sdk._utilities.general_utils import (
     get_promptflow_devkit_version,
     get_promptflow_sdk_version,
     read_write_by_user,

src/promptflow-devkit/promptflow/_sdk/_tracing.py

@@ -51,11 +51,11 @@
     is_port_in_use,
     is_run_from_built_binary,
 )
-from promptflow._sdk._utility.general_utils import (
+from promptflow._sdk._utilities.general_utils import (
     add_executable_script_to_env_path,
     extract_workspace_triad_from_trace_provider,
 )
-from promptflow._sdk._utility.tracing_utils import get_workspace_kind, parse_kv_from_pb_attribute, parse_protobuf_span
+from promptflow._sdk._utilities.tracing_utils import get_workspace_kind, parse_kv_from_pb_attribute, parse_protobuf_span
 from promptflow._utils.logger_utils import get_cli_sdk_logger
 from promptflow._utils.thread_utils import ThreadWithContextVars
 from promptflow.tracing._integrations._openai_injector import inject_openai_api

src/promptflow-devkit/promptflow/_sdk/_utility/__init__.py → src/promptflow-devkit/promptflow/_sdk/_utilities/__init__.py

@@ -8,6 +8,3 @@
 # So we need to rename the directory to _utility to avoid this issue.
 # On the other hand, promptflow-runtime imported some functions from _utils previously, so we need to keep both _utils
 # directory and _utils.py file for backward compatibility.
-
-# TODO: rename _utility to _utils after promptflow-runtime start  to give warning
-#   on environment with lower version of promptflow

src/promptflow-devkit/promptflow/_sdk/_version_hint_utils.py

@@ -27,7 +27,7 @@
 
 
 def get_cached_versions():
-    from promptflow._sdk._utility.general_utils import read_write_by_user
+    from promptflow._sdk._utilities.general_utils import read_write_by_user
 
     (HOME_PROMPT_FLOW_DIR / PF_VERSION_CHECK).touch(mode=read_write_by_user(), exist_ok=True)
     with open(HOME_PROMPT_FLOW_DIR / PF_VERSION_CHECK, "r") as f:
@@ -101,7 +101,7 @@ def hint_for_update():
     if last_hint_time is None or (
         datetime.datetime.now() > last_hint_time + datetime.timedelta(days=HINT_INTERVAL_DAY)
     ):
-        from promptflow._sdk._utility.general_utils import get_promptflow_devkit_version
+        from promptflow._sdk._utilities.general_utils import get_promptflow_devkit_version
 
         cached_versions[CURRENT_VERSION] = get_promptflow_devkit_version()
         if LATEST_VERSION in cached_versions: