Skip to content

Commit

Permalink
fix: runtime backward compatibility (#3059)
Browse files Browse the repository at this point in the history
# Description

there is an issue on pip that, when installing promptflow < 1.8.0 with
promptflow >= 1.8.0 installed, it will try to
uninstall promptflow first, but will keep the directory _utils.
after that, both the _utils directory and old _utils.py file will exist
in the site-packages directory and cause import error.

So:
1. we can't recover _utils.py given 1.10.0 already includes directory
_utils
2. instead, we rename _utils to _utilities

PR that bring this change:
[link](https://github.com/microsoft/promptflow/pull/3019/files#diff-928b3b3c5544dade19729ae052cef0161ab1d6f8ea443fee17f8275ee1d6b1b4)

# All Promptflow Contribution checklist:
- [x] **The pull request does not introduce [breaking changes].**
- [x] **CHANGELOG is updated for new features, bug fixes or other
significant changes.**
- [x] **I have read the [contribution guidelines](../CONTRIBUTING.md).**
- [x] **Create an issue and link to the pull request to get dedicated
review from promptflow team. Learn more: [suggested
workflow](../CONTRIBUTING.md#suggested-workflow).**

## General Guidelines and Best Practices
- [x] Title of the pull request is clear and informative.
- [ ] There are a small number of commits, each of which have an
informative message. This means that previously merged commits do not
appear in the history of the PR. For more information on cleaning up the
commits in your PR, [see this
page](https://github.com/Azure/azure-powershell/blob/master/documentation/development-docs/cleaning-up-commits.md).

### Testing Guidelines
- [ ] Pull request includes test coverage for the included changes.
  • Loading branch information
elliotzh authored and crazygao committed May 6, 2024
1 parent ce7c2df commit c976236
Show file tree
Hide file tree
Showing 65 changed files with 114 additions and 109 deletions.
2 changes: 1 addition & 1 deletion scripts/installer/windows/scripts/generate_dependency.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import copy
from pip._vendor import tomli as toml
from pathlib import Path
from promptflow._sdk._utils import render_jinja_template
from promptflow._sdk._utilities.general_utils import render_jinja_template


def get_git_base_dir():
Expand Down
2 changes: 1 addition & 1 deletion src/promptflow-azure/promptflow/azure/_cli/_run.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
)
from promptflow._sdk._constants import MAX_SHOW_DETAILS_RESULTS, ListViewType
from promptflow._sdk._errors import InvalidRunStatusError
from promptflow._sdk._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

Expand Down
5 changes: 4 additions & 1 deletion src/promptflow-azure/promptflow/azure/_cli/entry.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@
import logging # noqa: E402
import sys # noqa: E402

from promptflow._sdk._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
Expand Down
6 changes: 3 additions & 3 deletions src/promptflow-azure/promptflow/azure/_entities/_flow.py
Original file line number Diff line number Diff line change
Expand Up @@ -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._utils import PromptflowIgnoreFile, load_yaml, remove_empty_element_from_dict
from promptflow._sdk._utils.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
Expand Down Expand Up @@ -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._utils.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))

Expand Down
2 changes: 1 addition & 1 deletion src/promptflow-azure/promptflow/azure/_pf_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

from promptflow._sdk._constants import MAX_SHOW_DETAILS_RESULTS
from promptflow._sdk._errors import RunOperationParameterError
from promptflow._sdk._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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
SPAN_EVENTS_NAME_PF_OUTPUT,
TRACE_DEFAULT_COLLECTION,
)
from promptflow._sdk._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

Expand Down
2 changes: 1 addition & 1 deletion src/promptflow-azure/promptflow/azure/_utils/_tracing.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from azure.identity import AzureCliCredential

from promptflow._constants import AzureWorkspaceKind, CosmosDBContainerName
from promptflow._sdk._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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import httpx

from promptflow._sdk._errors import ArtifactInternalError, SDKError, UserAuthenticationError
from promptflow._sdk._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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
_ScopeDependentOperations,
)

from promptflow._sdk._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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
)
from promptflow._sdk._errors import FlowOperationError
from promptflow._sdk._telemetry import ActivityType, WorkspaceTelemetryMixin, monitor_operation
from promptflow._sdk._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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import httpx

from promptflow._sdk._errors import MetricInternalError, SDKError, UserAuthenticationError
from promptflow._sdk._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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,12 @@
)
from promptflow._sdk._errors import InvalidRunStatusError, RunNotFoundError, RunOperationParameterError
from promptflow._sdk._telemetry import ActivityType, WorkspaceTelemetryMixin, monitor_operation
from promptflow._sdk._utils import incremental_print, is_multi_container_enabled, is_remote_uri, print_red_error
from promptflow._sdk._utilities.general_utils import (
incremental_print,
is_multi_container_enabled,
is_remote_uri,
print_red_error,
)
from promptflow._sdk.entities import Run
from promptflow._utils.async_utils import async_run_allowing_running_loop
from promptflow._utils.logger_utils import get_cli_sdk_logger
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
log_activity,
)
from promptflow._sdk._telemetry.logging_handler import get_promptflow_sdk_log_handler
from promptflow._sdk._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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from sdk_cli_azure_test.conftest import EAGER_FLOWS_DIR, FLOWS_DIR

from promptflow import load_run
from promptflow._sdk._utils.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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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._utils.tracing 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
Expand Down
3 changes: 3 additions & 0 deletions src/promptflow-devkit/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/promptflow-devkit/promptflow/_cli/_params.py
Original file line number Diff line number Diff line change
Expand Up @@ -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._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
Expand Down
2 changes: 1 addition & 1 deletion src/promptflow-devkit/promptflow/_cli/_pf/_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -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._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()
Expand Down
6 changes: 3 additions & 3 deletions src/promptflow-devkit/promptflow/_cli/_pf/_flow.py
Original file line number Diff line number Diff line change
Expand Up @@ -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._utils import generate_yaml_entry_without_recover
from promptflow._sdk._utils.chat_utils import construct_chat_page_url
from promptflow._sdk._utils.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
Expand Down
2 changes: 1 addition & 1 deletion src/promptflow-devkit/promptflow/_cli/_pf/_run.py
Original file line number Diff line number Diff line change
Expand Up @@ -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._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
Expand Down
2 changes: 1 addition & 1 deletion src/promptflow-devkit/promptflow/_cli/_pf/_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
is_run_from_built_binary,
kill_exist_service,
)
from promptflow._sdk._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

Expand Down
2 changes: 1 addition & 1 deletion src/promptflow-devkit/promptflow/_cli/_pf/_upgrade.py
Original file line number Diff line number Diff line change
Expand Up @@ -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._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 ""
Expand Down
5 changes: 4 additions & 1 deletion src/promptflow-devkit/promptflow/_cli/_pf/entry.py
Original file line number Diff line number Diff line change
Expand Up @@ -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._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

Expand Down
2 changes: 1 addition & 1 deletion src/promptflow-devkit/promptflow/_cli/_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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._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
Expand Down
5 changes: 4 additions & 1 deletion src/promptflow-devkit/promptflow/_internal/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
from promptflow._core._errors import GenerateMetaUserError, PackageToolNotFoundError, ToolExecutionError
from promptflow._core.cache_manager import AbstractCacheManager, CacheManager, enable_cache
from promptflow._core.connection_manager import ConnectionManager
from promptflow._core.entry_meta_generator import generate_flow_meta
from promptflow._core.flow_execution_context import FlowExecutionContext
from promptflow._core.log_manager import NodeLogManager, NodeLogWriter
from promptflow._core.metric_logger import add_metric_logger
Expand Down Expand Up @@ -50,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._utils.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
Expand Down Expand Up @@ -112,7 +113,9 @@
)
from promptflow.core._serving.v1.utils import handle_error_to_response, streaming_response_required
from promptflow.core._utils import (
get_used_connection_names_from_dict,
get_used_connection_names_from_environment_variables,
update_dict_value_with_connections,
update_environment_variables_with_connections,
)
from promptflow.executor._errors import InputNotFound
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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._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
Expand Down Expand Up @@ -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._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,
Expand Down
2 changes: 1 addition & 1 deletion src/promptflow-devkit/promptflow/_sdk/_configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
HOME_PROMPT_FLOW_DIR,
SERVICE_CONFIG_FILE,
)
from promptflow._sdk._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
Expand Down
2 changes: 1 addition & 1 deletion src/promptflow-devkit/promptflow/_sdk/_mlflow.py
Original file line number Diff line number Diff line change
Expand Up @@ -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._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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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._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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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._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
Expand Down
7 changes: 2 additions & 5 deletions src/promptflow-devkit/promptflow/_sdk/_orchestrator/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,12 @@
)
from promptflow._sdk._errors import InvalidFlowError, RunOperationError
from promptflow._sdk._load_functions import load_flow
from promptflow._sdk._utils import (
_merge_local_code_and_additional_includes,
get_used_connection_names_from_dict,
update_dict_value_with_connections,
)
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
from promptflow.contracts.flow import Flow as ExecutableFlow
from promptflow.core._utils import get_used_connection_names_from_dict, update_dict_value_with_connections
from promptflow.exceptions import UserErrorException

logger = get_cli_sdk_logger()
Expand Down
2 changes: 1 addition & 1 deletion src/promptflow-devkit/promptflow/_sdk/_orm/session.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
TRACE_MGMT_DB_PATH,
TRACE_MGMT_DB_SESSION_ACQUIRE_LOCK_PATH,
)
from promptflow._sdk._utils import (
from promptflow._sdk._utilities.general_utils import (
get_promptflow_sdk_version,
print_red_error,
print_yellow_warning,
Expand Down
2 changes: 1 addition & 1 deletion src/promptflow-devkit/promptflow/_sdk/_pf_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from ._constants import MAX_SHOW_DETAILS_RESULTS
from ._load_functions import load_flow
from ._user_agent import USER_AGENT
from ._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
Expand Down
2 changes: 1 addition & 1 deletion src/promptflow-devkit/promptflow/_sdk/_service/apis/ui.py
Original file line number Diff line number Diff line change
Expand Up @@ -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._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
Expand Down
2 changes: 1 addition & 1 deletion src/promptflow-devkit/promptflow/_sdk/_service/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
is_run_from_built_binary,
kill_exist_service,
)
from promptflow._sdk._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()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,11 @@
PF_SERVICE_PORT_FILE,
)
from promptflow._sdk._errors import ConnectionNotFoundError, RunNotFoundError
from promptflow._sdk._utils import get_promptflow_devkit_version, get_promptflow_sdk_version, read_write_by_user
from promptflow._sdk._utilities.general_utils import (
get_promptflow_devkit_version,
get_promptflow_sdk_version,
read_write_by_user,
)
from promptflow._sdk._version import VERSION
from promptflow._utils.logger_utils import get_cli_sdk_logger
from promptflow._utils.yaml_utils import dump_yaml, load_yaml
Expand Down
Loading

0 comments on commit c976236

Please sign in to comment.