From 74117bba96d351bff34d8500c4d68a21814a9f6d Mon Sep 17 00:00:00 2001 From: Philip Gao Date: Thu, 28 Mar 2024 11:29:38 +0800 Subject: [PATCH] [Separation] Separation of devkit and azure (#2502) # Description Move devkits and azures ![image](https://github.com/microsoft/promptflow/assets/2208599/bec0ee1d-2d40-46b3-845f-296653fb793a) ![image](https://github.com/microsoft/promptflow/assets/2208599/bb409b09-9ffe-4ad1-bd3b-6bf80f9cff96) ![image](https://github.com/microsoft/promptflow/assets/2208599/296aec64-2305-4863-803d-88b41eb4d382) We have some critical issues when install streamlit with poetry. And pf scripts, will fix in later patches. # All Promptflow Contribution checklist: - [ ] **The pull request does not introduce [breaking changes].** - [ ] **CHANGELOG is updated for new features, bug fixes or other significant changes.** - [ ] **I have read the [contribution guidelines](../CONTRIBUTING.md).** - [ ] **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 - [ ] 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. --- .cspell.json | 9 ++- .../promptflow-executor-e2e-test.yml | 8 ++- .../promptflow-executor-unit-test.yml | 8 ++- .../promptflow-global-config-test.yml | 4 ++ .../workflows/promptflow-import-linter.yml | 4 ++ .github/workflows/promptflow-sdk-cli-test.yml | 5 +- .../sdk-cli-azure-test-production.yml | 2 + .../sdk-cli-azure-test-pull-request.yml | 3 + .github/workflows/sdk-cli-azure-test.yml | 2 + .../workflows/sdk-cli-perf-monitor-test.yml | 6 +- .gitignore | 1 - .pre-commit-config.yaml | 2 +- scripts/check_enforcer/check_enforcer.py | 10 +-- scripts/compliance-check/user_exclusion.xml | 2 +- scripts/dev-setup/main.py | 5 +- setup.cfg | 4 +- .../promptflow/azure/__init__.py | 6 +- .../promptflow/azure}/_cli/__init__.py | 0 .../promptflow/azure/_cli/_connection.py | 0 .../promptflow/azure/_cli/_flow.py | 0 .../promptflow/azure/_cli/_run.py | 0 .../promptflow/azure/_cli/_utils.py | 0 .../promptflow/azure/_cli/entry.py | 0 .../promptflow/azure/_constants/__init__.py | 0 .../promptflow/azure/_constants/_component.py | 0 .../promptflow/azure/_constants/_flow.py | 0 .../promptflow/azure/_entities}/__init__.py | 0 .../promptflow/azure/_entities/_flow.py | 0 .../_entities/_workspace_connection_spec.py | 0 .../promptflow/azure/_load_functions.py | 0 .../promptflow/azure/_ml/__init__.py | 0 .../promptflow/azure/_pf_client.py | 0 .../promptflow/azure/_restclient/README.md | 0 .../promptflow/azure/_restclient/__init__.py | 0 .../azure/_restclient/flow/__init__.py | 0 ...achine_learning_designer_service_client.py | 0 .../azure/_restclient/flow/_configuration.py | 0 .../azure/_restclient/flow/_patch.py | 0 .../azure/_restclient/flow/_vendor.py | 0 .../azure/_restclient/flow/aio/__init__.py | 0 ...achine_learning_designer_service_client.py | 0 .../_restclient/flow/aio/_configuration.py | 0 .../azure/_restclient/flow/aio/_patch.py | 0 .../flow/aio/operations/__init__.py | 0 .../aio/operations/_bulk_runs_operations.py | 0 .../aio/operations/_connection_operations.py | 0 .../aio/operations/_connections_operations.py | 0 .../_experiment_templates_operations.py | 0 .../aio/operations/_experiments_operations.py | 0 .../operations/_flow_runs_admin_operations.py | 0 .../operations/_flow_runtimes_operations.py | 0 ...ntimes_workspace_independent_operations.py | 0 .../_flow_sessions_admin_operations.py | 0 .../operations/_flow_sessions_operations.py | 0 .../flow/aio/operations/_flows_operations.py | 0 .../operations/_flows_provider_operations.py | 0 .../flow/aio/operations/_tools_operations.py | 0 .../operations/_trace_sessions_operations.py | 0 .../azure/_restclient/flow/models/__init__.py | 0 ..._learning_designer_service_client_enums.py | 0 .../azure/_restclient/flow/models/_models.py | 0 .../_restclient/flow/models/_models_py3.py | 0 .../_restclient/flow/operations/__init__.py | 0 .../flow/operations/_bulk_runs_operations.py | 0 .../flow/operations/_connection_operations.py | 0 .../operations/_connections_operations.py | 0 .../_experiment_templates_operations.py | 0 .../operations/_experiments_operations.py | 0 .../operations/_flow_runs_admin_operations.py | 0 .../operations/_flow_runtimes_operations.py | 0 ...ntimes_workspace_independent_operations.py | 0 .../_flow_sessions_admin_operations.py | 0 .../operations/_flow_sessions_operations.py | 0 .../flow/operations/_flows_operations.py | 0 .../operations/_flows_provider_operations.py | 0 .../flow/operations/_tools_operations.py | 0 .../operations/_trace_sessions_operations.py | 0 .../azure/_restclient/flow/py.typed | 0 .../azure/_restclient/flow_service_caller.py | 0 .../_restclient/service_caller_factory.py | 0 .../promptflow/azure/_restclient/swagger.json | 0 .../promptflow/azure/_schemas}/__init__.py | 0 .../promptflow/azure/_schemas/_flow_schema.py | 0 .../promptflow/azure/_storage/__init__.py | 0 .../azure/_storage/cosmosdb/__init__.py | 0 .../azure/_storage/cosmosdb/client.py | 0 .../azure/_storage/cosmosdb/collection.py | 0 .../azure/_storage/cosmosdb/cosmosdb_utils.py | 0 .../azure/_storage/cosmosdb/span.py | 0 .../azure/_storage/cosmosdb/summary.py | 0 .../promptflow/azure/_utils/__init__.py | 0 .../promptflow/azure/_utils/_tracing.py | 0 .../promptflow/azure/_utils/_url_utils.py | 0 .../promptflow/azure/_utils/general.py | 0 .../promptflow/azure/_version.py | 7 -- .../promptflow/azure/operations/__init__.py | 0 .../operations/_arm_connection_operations.py | 0 .../azure/operations/_artifact_utilities.py | 0 .../azure/operations/_async_run_downloader.py | 0 .../operations/_connection_operations.py | 0 .../operations/_fileshare_storeage_helper.py | 0 .../azure/operations/_flow_operations.py | 0 .../azure/operations/_run_operations.py | 0 .../azure/operations/_trace_operations.py | 0 .../resources/component_spec_template.yaml | 0 src/promptflow-azure/pyproject.toml | 14 ++++ .../promptflow/contracts/__init__.py | 0 .../promptflow/contracts/_errors.py | 0 .../promptflow/contracts/_run_management.py | 0 .../promptflow/contracts/flow.py | 0 .../promptflow/contracts/multimedia.py | 0 .../promptflow/contracts/run_info.py | 0 .../promptflow/contracts/run_mode.py | 0 .../promptflow/contracts/tool.py | 0 .../promptflow/contracts/types.py | 0 src/promptflow-core/pyproject.toml | 6 +- src/promptflow-devkit/pf | 10 +++ .../promptflow/_cli}/__init__.py | 0 .../promptflow/_cli/_params.py | 0 .../promptflow/_cli/_pf}/__init__.py | 0 .../promptflow/_cli/_pf/_config.py | 0 .../promptflow/_cli/_pf/_connection.py | 0 .../promptflow/_cli/_pf/_experiment.py | 0 .../promptflow/_cli/_pf/_flow.py | 0 .../_cli/_pf/_init_entry_generators.py | 0 .../promptflow/_cli/_pf/_run.py | 0 .../promptflow/_cli/_pf/_tool.py | 0 .../promptflow/_cli/_pf/_upgrade.py | 0 .../promptflow/_cli/_pf/entry.py | 0 .../promptflow/_cli/_pf/help.py | 0 .../promptflow/_cli/_user_agent.py | 0 .../promptflow/_cli/_utils.py | 0 .../flow_files/.promptflow/flow.tools.json | 0 .../_cli/data/chat_flow/flow_files/README.md | 0 .../data/chat_flow/flow_files/chat.jinja2 | 0 .../template/azure_openai.yaml.jinja2 | 0 .../chat_flow/template/flow.dag.yaml.jinja2 | 0 .../chat_flow/template/openai.yaml.jinja2 | 0 .../_cli/data/entry_flow/flow.dag.yaml.jinja2 | 0 .../data/entry_flow/flow.tools.json.jinja2 | 0 .../promptflow/_cli/data/entry_flow/gitignore | 0 .../_cli/data/entry_flow/requirements_txt | 1 + .../_cli/data/entry_flow/tool.py.jinja2 | 0 .../.promptflow/flow.tools.json | 0 .../_cli/data/evaluation_flow/aggregate.py | 0 .../_cli/data/evaluation_flow/data.jsonl | 0 .../_cli/data/evaluation_flow/flow.dag.yaml | 0 .../_cli/data/evaluation_flow/line_process.py | 0 .../_cli/data/package_tool/README.md.jinja2 | 2 +- .../promptflow/_cli/data/package_tool/init.py | 0 .../_cli/data/package_tool/setup.py.jinja2 | 0 .../_cli/data/package_tool/tool.py.jinja2 | 0 .../_cli/data/package_tool/utils.py.jinja2 | 0 .../standard_flow/.promptflow/flow.tools.json | 0 .../_cli/data/standard_flow/data.jsonl | 0 .../_cli/data/standard_flow/flow.dag.yaml | 0 .../_cli/data/standard_flow/hello.jinja2 | 0 .../_cli/data/standard_flow/hello.py | 0 .../promptflow/_cli/pf.py | 0 .../promptflow/_internal/__init__.py | 0 .../promptflow/_proxy/__init__.py | 0 .../_proxy/_base_inspector_proxy.py | 0 .../_proxy/_csharp_inspector_proxy.py | 0 .../promptflow/_proxy/_proxy_factory.py | 0 .../_proxy/_python_inspector_proxy.py | 0 .../promptflow/_sdk}/__init__.py | 0 .../promptflow/_sdk/_configuration.py | 0 .../_sdk/_connection_provider}/__init__.py | 0 .../_local_connection_provider.py | 0 .../promptflow/_sdk/_constants.py | 0 .../promptflow/_sdk/_errors.py | 0 .../promptflow/_sdk/_load_functions.py | 0 .../promptflow/_sdk/_mlflow.py | 0 .../promptflow/_sdk/_orm/__init__.py | 0 .../promptflow/_sdk/_orm/connection.py | 0 .../promptflow/_sdk/_orm/experiment.py | 0 .../_sdk/_orm/experiment_node_run.py | 0 .../promptflow/_sdk/_orm/orchestrator.py | 0 .../promptflow/_sdk/_orm/retry.py | 0 .../promptflow/_sdk/_orm/run_info.py | 0 .../promptflow/_sdk/_orm/session.py | 0 .../promptflow/_sdk/_orm/trace.py | 0 .../promptflow/_sdk/_pf_client.py | 0 .../promptflow/_sdk/_run_functions.py | 0 .../promptflow/_sdk/_service/.gitignore | 0 .../promptflow/_sdk/_service/README.md | 0 .../promptflow/_sdk/_service/__init__.py | 0 .../_sdk/_service/apis}/__init__.py | 0 .../_sdk/_service/apis/collector.py | 0 .../_sdk/_service/apis/connection.py | 0 .../_sdk/_service/apis/experiment.py | 0 .../promptflow/_sdk/_service/apis/flow.py | 0 .../promptflow/_sdk/_service/apis/line_run.py | 0 .../promptflow/_sdk/_service/apis/run.py | 0 .../promptflow/_sdk/_service/apis/span.py | 0 .../_sdk/_service/apis/telemetry.py | 0 .../promptflow/_sdk/_service/apis/ui.py | 0 .../promptflow/_sdk/_service/app.py | 0 .../promptflow/_sdk/_service/entry.py | 0 .../_service/generator_configs/csharp.yaml | 0 .../promptflow/_sdk/_service/pfsvc.py | 0 .../_sdk/_service/static/assets/favicon.ico | Bin .../_service/static/assets/index-Rg6Z62xy.js | 0 .../_sdk/_service/static/assets/index.mjs | 0 .../_sdk/_service/static/assets/style.css | 0 .../_sdk/_service/static/chat_index.html | 2 +- .../_sdk/_service/static/index.html | 0 .../promptflow/_sdk/_service/swagger.json | 0 .../_sdk/_service/utils}/__init__.py | 0 .../promptflow/_sdk/_service/utils/utils.py | 0 .../promptflow/_sdk/_serving}/__init__.py | 0 .../promptflow/_sdk/_serving/app.py | 0 .../promptflow/_sdk/_submitter/__init__.py | 0 .../_submitter/experiment_orchestrator.py | 0 .../_sdk/_submitter/run_submitter.py | 0 .../_sdk/_submitter/test_submitter.py | 0 .../promptflow/_sdk/_submitter/utils.py | 0 .../promptflow/_sdk/_telemetry/__init__.py | 0 .../promptflow/_sdk/_telemetry/activity.py | 0 .../_sdk/_telemetry/logging_handler.py | 0 .../promptflow/_sdk/_telemetry/telemetry.py | 0 .../promptflow/_sdk/_tracing.py | 0 .../promptflow/_sdk/_user_agent.py | 0 .../promptflow/_sdk/_utils.py | 0 .../promptflow/_sdk/_vendor/__init__.py | 0 .../promptflow/_sdk/_vendor/_asset_utils.py | 0 .../promptflow/_sdk/_vendor/_pathspec.py | 0 .../promptflow/_sdk/_visualize_functions.py | 0 .../_sdk/data/docker/Dockerfile.jinja2 | 0 .../promptflow/_sdk/data/docker/README.md | 0 .../runit/promptflow-serve/finish.jinja2 | 2 +- .../docker/runit/promptflow-serve/run.jinja2 | 0 .../_sdk/data/docker/start.sh.jinja2 | 0 .../_sdk/data/docker_csharp/Dockerfile.jinja2 | 0 .../_sdk/data/docker_csharp/README.md | 0 .../runit/promptflow-serve/finish.jinja2 | 2 +- .../runit/promptflow-serve/run.jinja2 | 2 +- .../_sdk/data/docker_csharp/start.sh.jinja2 | 0 .../promptflow/_sdk/data/executable/README.md | 0 .../promptflow/_sdk/data/executable/app.py | 0 .../_sdk/data/executable/app.spec.jinja2 | 0 .../promptflow/_sdk/data/executable/logo.png | Bin .../promptflow/_sdk/data/executable/main.py | 0 .../promptflow/_sdk/data/executable/utils.py | 0 .../promptflow/_sdk/data/tool.schema.json | 0 .../promptflow/_sdk/data/visualize.j2 | 0 .../promptflow/_sdk/entities/__init__.py | 0 .../_sdk/entities/_chat_group/__init__.py | 0 .../_sdk/entities/_chat_group/_chat_group.py | 0 .../entities/_chat_group/_chat_group_io.py | 0 .../_sdk/entities/_chat_group/_chat_role.py | 0 .../promptflow/_sdk/entities/_connection.py | 0 .../promptflow/_sdk/entities/_experiment.py | 0 .../_sdk/entities/_flow/__init__.py | 0 .../entities/_flow/_flow_context_resolver.py | 0 .../promptflow/_sdk/entities/_flow/base.py | 0 .../promptflow/_sdk/entities/_flow/dag.py | 0 .../promptflow/_sdk/entities/_flow/flex.py | 0 .../promptflow/_sdk/entities/_run.py | 0 .../promptflow/_sdk/entities/_run_inputs.py | 0 .../promptflow/_sdk/entities/_trace.py | 0 .../_sdk/entities/_validation/__init__.py | 0 .../_sdk/entities/_validation/core.py | 0 .../_sdk/entities/_validation/schema.py | 0 .../_sdk/entities/_yaml_translatable.py | 0 .../promptflow/_sdk/operations/__init__.py | 0 .../_sdk/operations/_connection_operations.py | 0 .../_sdk/operations/_experiment_operations.py | 0 .../_sdk/operations/_flow_operations.py | 0 .../_local_azure_connection_operations.py | 0 .../operations/_local_storage_operations.py | 0 .../_sdk/operations/_run_operations.py | 0 .../_sdk/operations/_tool_operations.py | 0 .../_sdk/operations/_trace_operations.py | 0 .../promptflow/_sdk/schemas}/__init__.py | 0 .../promptflow/_sdk/schemas/_base.py | 0 .../promptflow/_sdk/schemas/_connection.py | 0 .../promptflow/_sdk/schemas/_experiment.py | 0 .../promptflow/_sdk/schemas/_fields.py | 0 .../promptflow/_sdk/schemas/_flow.py | 0 .../promptflow/_sdk/schemas/_run.py | 0 .../{devkit/__init__.py => _version.py} | 4 +- .../promptflow/batch/__init__.py | 0 .../promptflow/batch/_base_executor_proxy.py | 0 .../promptflow/batch/_batch_engine.py | 0 .../batch/_batch_inputs_processor.py | 0 .../batch/_csharp_base_executor_proxy.py | 0 .../batch/_csharp_executor_proxy.py | 0 .../promptflow/batch/_errors.py | 0 .../batch/_python_executor_proxy.py | 0 .../promptflow/batch/_result.py | 0 .../promptflow/client/__init__.py | 0 .../promptflow/devkit/_version.py | 7 -- .../promptflow/entities/__init__.py | 0 .../promptflow/operations/__init__.py | 0 src/promptflow-devkit/pyproject.toml | 67 ++++++++++++++++-- src/promptflow-recording/pyproject.toml | 1 + src/promptflow/MANIFEST.in | 5 -- src/promptflow/pf | 9 --- .../_cli/data/entry_flow/requirements_txt | 1 - src/promptflow/promptflow/azure/__init__.py | 9 --- src/promptflow/setup.py | 52 +++----------- 302 files changed, 160 insertions(+), 124 deletions(-) rename src/{promptflow/promptflow => promptflow-azure/promptflow/azure}/_cli/__init__.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_cli/_connection.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_cli/_flow.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_cli/_run.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_cli/_utils.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_cli/entry.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_constants/__init__.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_constants/_component.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_constants/_flow.py (100%) rename src/{promptflow/promptflow/_cli/_pf => promptflow-azure/promptflow/azure/_entities}/__init__.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_entities/_flow.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_entities/_workspace_connection_spec.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_load_functions.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_ml/__init__.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_pf_client.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/README.md (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/__init__.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/__init__.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/_azure_machine_learning_designer_service_client.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/_configuration.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/_patch.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/_vendor.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/aio/__init__.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/aio/_azure_machine_learning_designer_service_client.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/aio/_configuration.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/aio/_patch.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/aio/operations/__init__.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/aio/operations/_bulk_runs_operations.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/aio/operations/_connection_operations.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/aio/operations/_connections_operations.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/aio/operations/_experiment_templates_operations.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/aio/operations/_experiments_operations.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/aio/operations/_flow_runs_admin_operations.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/aio/operations/_flow_runtimes_operations.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/aio/operations/_flow_runtimes_workspace_independent_operations.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/aio/operations/_flow_sessions_admin_operations.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/aio/operations/_flow_sessions_operations.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/aio/operations/_flows_operations.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/aio/operations/_flows_provider_operations.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/aio/operations/_tools_operations.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/aio/operations/_trace_sessions_operations.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/models/__init__.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/models/_azure_machine_learning_designer_service_client_enums.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/models/_models.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/models/_models_py3.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/operations/__init__.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/operations/_bulk_runs_operations.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/operations/_connection_operations.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/operations/_connections_operations.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/operations/_experiment_templates_operations.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/operations/_experiments_operations.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/operations/_flow_runs_admin_operations.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/operations/_flow_runtimes_operations.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/operations/_flow_runtimes_workspace_independent_operations.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/operations/_flow_sessions_admin_operations.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/operations/_flow_sessions_operations.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/operations/_flows_operations.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/operations/_flows_provider_operations.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/operations/_tools_operations.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/operations/_trace_sessions_operations.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow/py.typed (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/flow_service_caller.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/service_caller_factory.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_restclient/swagger.json (100%) rename src/{promptflow/promptflow/_sdk => promptflow-azure/promptflow/azure/_schemas}/__init__.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_schemas/_flow_schema.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_storage/__init__.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_storage/cosmosdb/__init__.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_storage/cosmosdb/client.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_storage/cosmosdb/collection.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_storage/cosmosdb/cosmosdb_utils.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_storage/cosmosdb/span.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_storage/cosmosdb/summary.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_utils/__init__.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_utils/_tracing.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_utils/_url_utils.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/_utils/general.py (100%) delete mode 100644 src/promptflow-azure/promptflow/azure/_version.py rename src/{promptflow => promptflow-azure}/promptflow/azure/operations/__init__.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/operations/_arm_connection_operations.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/operations/_artifact_utilities.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/operations/_async_run_downloader.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/operations/_connection_operations.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/operations/_fileshare_storeage_helper.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/operations/_flow_operations.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/operations/_run_operations.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/operations/_trace_operations.py (100%) rename src/{promptflow => promptflow-azure}/promptflow/azure/resources/component_spec_template.yaml (100%) rename src/{promptflow => promptflow-core}/promptflow/contracts/__init__.py (100%) rename src/{promptflow => promptflow-core}/promptflow/contracts/_errors.py (100%) rename src/{promptflow => promptflow-core}/promptflow/contracts/_run_management.py (100%) rename src/{promptflow => promptflow-core}/promptflow/contracts/flow.py (100%) rename src/{promptflow => promptflow-core}/promptflow/contracts/multimedia.py (100%) rename src/{promptflow => promptflow-core}/promptflow/contracts/run_info.py (100%) rename src/{promptflow => promptflow-core}/promptflow/contracts/run_mode.py (100%) rename src/{promptflow => promptflow-core}/promptflow/contracts/tool.py (100%) rename src/{promptflow => promptflow-core}/promptflow/contracts/types.py (100%) create mode 100644 src/promptflow-devkit/pf rename src/{promptflow/promptflow/_sdk/_connection_provider => promptflow-devkit/promptflow/_cli}/__init__.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_cli/_params.py (100%) rename src/{promptflow/promptflow/_sdk/_service/apis => promptflow-devkit/promptflow/_cli/_pf}/__init__.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_cli/_pf/_config.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_cli/_pf/_connection.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_cli/_pf/_experiment.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_cli/_pf/_flow.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_cli/_pf/_init_entry_generators.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_cli/_pf/_run.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_cli/_pf/_tool.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_cli/_pf/_upgrade.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_cli/_pf/entry.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_cli/_pf/help.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_cli/_user_agent.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_cli/_utils.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_cli/data/chat_flow/flow_files/.promptflow/flow.tools.json (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_cli/data/chat_flow/flow_files/README.md (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_cli/data/chat_flow/flow_files/chat.jinja2 (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_cli/data/chat_flow/template/azure_openai.yaml.jinja2 (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_cli/data/chat_flow/template/flow.dag.yaml.jinja2 (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_cli/data/chat_flow/template/openai.yaml.jinja2 (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_cli/data/entry_flow/flow.dag.yaml.jinja2 (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_cli/data/entry_flow/flow.tools.json.jinja2 (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_cli/data/entry_flow/gitignore (100%) create mode 100644 src/promptflow-devkit/promptflow/_cli/data/entry_flow/requirements_txt rename src/{promptflow => promptflow-devkit}/promptflow/_cli/data/entry_flow/tool.py.jinja2 (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_cli/data/evaluation_flow/.promptflow/flow.tools.json (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_cli/data/evaluation_flow/aggregate.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_cli/data/evaluation_flow/data.jsonl (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_cli/data/evaluation_flow/flow.dag.yaml (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_cli/data/evaluation_flow/line_process.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_cli/data/package_tool/README.md.jinja2 (97%) rename src/{promptflow => promptflow-devkit}/promptflow/_cli/data/package_tool/init.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_cli/data/package_tool/setup.py.jinja2 (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_cli/data/package_tool/tool.py.jinja2 (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_cli/data/package_tool/utils.py.jinja2 (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_cli/data/standard_flow/.promptflow/flow.tools.json (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_cli/data/standard_flow/data.jsonl (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_cli/data/standard_flow/flow.dag.yaml (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_cli/data/standard_flow/hello.jinja2 (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_cli/data/standard_flow/hello.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_cli/pf.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_internal/__init__.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_proxy/__init__.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_proxy/_base_inspector_proxy.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_proxy/_csharp_inspector_proxy.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_proxy/_proxy_factory.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_proxy/_python_inspector_proxy.py (100%) rename src/{promptflow/promptflow/_sdk/_service/utils => promptflow-devkit/promptflow/_sdk}/__init__.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_configuration.py (100%) rename src/{promptflow/promptflow/_sdk/_serving => promptflow-devkit/promptflow/_sdk/_connection_provider}/__init__.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_connection_provider/_local_connection_provider.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_constants.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_errors.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_load_functions.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_mlflow.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_orm/__init__.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_orm/connection.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_orm/experiment.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_orm/experiment_node_run.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_orm/orchestrator.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_orm/retry.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_orm/run_info.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_orm/session.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_orm/trace.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_pf_client.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_run_functions.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_service/.gitignore (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_service/README.md (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_service/__init__.py (100%) rename src/{promptflow/promptflow/_sdk/schemas => promptflow-devkit/promptflow/_sdk/_service/apis}/__init__.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_service/apis/collector.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_service/apis/connection.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_service/apis/experiment.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_service/apis/flow.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_service/apis/line_run.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_service/apis/run.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_service/apis/span.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_service/apis/telemetry.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_service/apis/ui.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_service/app.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_service/entry.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_service/generator_configs/csharp.yaml (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_service/pfsvc.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_service/static/assets/favicon.ico (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_service/static/assets/index-Rg6Z62xy.js (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_service/static/assets/index.mjs (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_service/static/assets/style.css (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_service/static/chat_index.html (98%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_service/static/index.html (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_service/swagger.json (100%) rename src/{promptflow/promptflow/azure/_cli => promptflow-devkit/promptflow/_sdk/_service/utils}/__init__.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_service/utils/utils.py (100%) rename src/{promptflow/promptflow/azure/_entities => promptflow-devkit/promptflow/_sdk/_serving}/__init__.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_serving/app.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_submitter/__init__.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_submitter/experiment_orchestrator.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_submitter/run_submitter.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_submitter/test_submitter.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_submitter/utils.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_telemetry/__init__.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_telemetry/activity.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_telemetry/logging_handler.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_telemetry/telemetry.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_tracing.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_user_agent.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_utils.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_vendor/__init__.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_vendor/_asset_utils.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_vendor/_pathspec.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/_visualize_functions.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/data/docker/Dockerfile.jinja2 (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/data/docker/README.md (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/data/docker/runit/promptflow-serve/finish.jinja2 (84%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/data/docker/runit/promptflow-serve/run.jinja2 (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/data/docker/start.sh.jinja2 (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/data/docker_csharp/Dockerfile.jinja2 (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/data/docker_csharp/README.md (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/data/docker_csharp/runit/promptflow-serve/finish.jinja2 (53%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/data/docker_csharp/runit/promptflow-serve/run.jinja2 (87%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/data/docker_csharp/start.sh.jinja2 (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/data/executable/README.md (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/data/executable/app.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/data/executable/app.spec.jinja2 (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/data/executable/logo.png (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/data/executable/main.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/data/executable/utils.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/data/tool.schema.json (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/data/visualize.j2 (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/entities/__init__.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/entities/_chat_group/__init__.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/entities/_chat_group/_chat_group.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/entities/_chat_group/_chat_group_io.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/entities/_chat_group/_chat_role.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/entities/_connection.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/entities/_experiment.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/entities/_flow/__init__.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/entities/_flow/_flow_context_resolver.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/entities/_flow/base.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/entities/_flow/dag.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/entities/_flow/flex.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/entities/_run.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/entities/_run_inputs.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/entities/_trace.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/entities/_validation/__init__.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/entities/_validation/core.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/entities/_validation/schema.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/entities/_yaml_translatable.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/operations/__init__.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/operations/_connection_operations.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/operations/_experiment_operations.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/operations/_flow_operations.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/operations/_local_azure_connection_operations.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/operations/_local_storage_operations.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/operations/_run_operations.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/operations/_tool_operations.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/operations/_trace_operations.py (100%) rename src/{promptflow/promptflow/azure/_schemas => promptflow-devkit/promptflow/_sdk/schemas}/__init__.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/schemas/_base.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/schemas/_connection.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/schemas/_experiment.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/schemas/_fields.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/schemas/_flow.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/_sdk/schemas/_run.py (100%) rename src/promptflow-devkit/promptflow/{devkit/__init__.py => _version.py} (74%) rename src/{promptflow => promptflow-devkit}/promptflow/batch/__init__.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/batch/_base_executor_proxy.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/batch/_batch_engine.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/batch/_batch_inputs_processor.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/batch/_csharp_base_executor_proxy.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/batch/_csharp_executor_proxy.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/batch/_errors.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/batch/_python_executor_proxy.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/batch/_result.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/client/__init__.py (100%) delete mode 100644 src/promptflow-devkit/promptflow/devkit/_version.py rename src/{promptflow => promptflow-devkit}/promptflow/entities/__init__.py (100%) rename src/{promptflow => promptflow-devkit}/promptflow/operations/__init__.py (100%) delete mode 100644 src/promptflow/pf delete mode 100644 src/promptflow/promptflow/_cli/data/entry_flow/requirements_txt delete mode 100644 src/promptflow/promptflow/azure/__init__.py diff --git a/.cspell.json b/.cspell.json index 6f9d9c5c1ec..0e45432fb3d 100644 --- a/.cspell.json +++ b/.cspell.json @@ -25,18 +25,21 @@ "**/*.txt", ".gitignore", "scripts/docs/_build/**", - "src/promptflow/promptflow/azure/_restclient/flow/**", - "src/promptflow/promptflow/azure/_restclient/swagger.json", - "src/promptflow/promptflow/azure/_models/**", + "src/promptflow-azure/promptflow/azure/_restclient/flow/**", + "src/promptflow-azure/promptflow/azure/_restclient/swagger.json", + "src/promptflow-azure/promptflow/azure/_models/**", + "src/promptflow-azure/tests/**", "src/promptflow-core/promptflow/core/_connection_provider/_models/**", "src/promptflow/tests/**", "src/promptflow-recording/**", "src/promptflow-tools/tests/**", "**/flow.dag.yaml", + "**/pyproject.toml", "**/setup.py", "scripts/installer/curl_install_pypi/**", "scripts/installer/windows/**", "src/promptflow/promptflow/_sdk/_service/pfsvc.py", + "src/promptflow-devkit/promptflow/_sdk/_service/pfsvc.py", ".github/workflows/**", ".github/actions/**", ".github/pipelines/**" diff --git a/.github/workflows/promptflow-executor-e2e-test.yml b/.github/workflows/promptflow-executor-e2e-test.yml index dbc2c5dcd8d..de5a676ab23 100644 --- a/.github/workflows/promptflow-executor-e2e-test.yml +++ b/.github/workflows/promptflow-executor-e2e-test.yml @@ -106,14 +106,16 @@ jobs: Set-PSDebug -Trace 1 pip install -r ${{ github.workspace }}/src/promptflow/dev_requirements.txt pip install ${{ github.workspace }}/src/promptflow-tracing - pip install ${{ github.workspace }}/src/promptflow-core - gci ./promptflow -Recurse | % {if ($_.Name.Contains('.whl')) {python -m pip install "$($_.FullName)[executor-service]"}} + pip install ${{ github.workspace }}/src/promptflow-core[executor-service] + pip install ${{ github.workspace }}/src/promptflow-devkit + pip install ${{ github.workspace }}/src/promptflow-azure + gci ./promptflow -Recurse | % {if ($_.Name.Contains('.whl')) {python -m pip install "$($_.FullName)"}} gci ./promptflow-tools -Recurse | % {if ($_.Name.Contains('.whl')) {python -m pip install $_.FullName}} pip freeze - name: install recording run: | pip install vcrpy - pip install -e . + pip install . working-directory: ${{ env.RECORD_DIRECTORY }} - name: Azure Login uses: azure/login@v1 diff --git a/.github/workflows/promptflow-executor-unit-test.yml b/.github/workflows/promptflow-executor-unit-test.yml index b5fdeb5b6a5..d545931576f 100644 --- a/.github/workflows/promptflow-executor-unit-test.yml +++ b/.github/workflows/promptflow-executor-unit-test.yml @@ -110,14 +110,16 @@ jobs: Set-PSDebug -Trace 1 pip install -r ${{ github.workspace }}/src/promptflow/dev_requirements.txt pip install ${{ github.workspace }}/src/promptflow-tracing - pip install ${{ github.workspace }}/src/promptflow-core - gci ./promptflow -Recurse | % {if ($_.Name.Contains('.whl')) {python -m pip install "$($_.FullName)[executor-service]"}} + pip install ${{ github.workspace }}/src/promptflow-core[executor-service] + pip install ${{ github.workspace }}/src/promptflow-devkit + pip install ${{ github.workspace }}/src/promptflow-azure + gci ./promptflow -Recurse | % {if ($_.Name.Contains('.whl')) {python -m pip install "$($_.FullName)"}} gci ./promptflow-tools -Recurse | % {if ($_.Name.Contains('.whl')) {python -m pip install $_.FullName}} pip freeze - name: install recording run: | pip install vcrpy - pip install -e . + pip install . working-directory: ${{ env.RECORD_DIRECTORY }} - name: Azure Login uses: azure/login@v1 diff --git a/.github/workflows/promptflow-global-config-test.yml b/.github/workflows/promptflow-global-config-test.yml index 0e887a5e56e..fe00424371c 100644 --- a/.github/workflows/promptflow-global-config-test.yml +++ b/.github/workflows/promptflow-global-config-test.yml @@ -69,6 +69,10 @@ jobs: echo "Installed promptflow-tracing" pip uninstall -y promptflow-core pip install ${{ github.workspace }}/src/promptflow-core + pip uninstall -y promptflow-devkit + pip install ${{ github.workspace }}/src/promptflow-devkit + pip uninstall -y promptflow-azure + pip install ${{ github.workspace }}/src/promptflow-azure pip freeze - name: Azure Login uses: azure/login@v1 diff --git a/.github/workflows/promptflow-import-linter.yml b/.github/workflows/promptflow-import-linter.yml index df52dc8719b..9c920ffd622 100644 --- a/.github/workflows/promptflow-import-linter.yml +++ b/.github/workflows/promptflow-import-linter.yml @@ -18,6 +18,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - name: Set up Python 3.11 + uses: actions/setup-python@v5 + with: + python-version: 3.11 - uses: snok/install-poetry@v1 - name: Install all packages run: | diff --git a/.github/workflows/promptflow-sdk-cli-test.yml b/.github/workflows/promptflow-sdk-cli-test.yml index 6297c16f4bc..27c04a2b47e 100644 --- a/.github/workflows/promptflow-sdk-cli-test.yml +++ b/.github/workflows/promptflow-sdk-cli-test.yml @@ -5,6 +5,7 @@ on: pull_request: paths: - src/promptflow-core/** + - src/promptflow-devkit/** - src/promptflow/** - src/promptflow-tracing/** - scripts/building/** @@ -81,13 +82,14 @@ jobs: pip install -r ${{ github.workspace }}/src/promptflow/dev_requirements.txt pip install ${{ github.workspace }}/src/promptflow-tracing pip install ${{ github.workspace }}/src/promptflow-core + pip install ${{ github.workspace }}/src/promptflow-devkit[pyarrow] gci ./promptflow -Recurse | % {if ($_.Name.Contains('.whl')) {python -m pip install "$($_.FullName)"}} gci ./promptflow-tools -Recurse | % {if ($_.Name.Contains('.whl')) {python -m pip install $_.FullName}} pip freeze - name: install recording run: | pip install vcrpy - pip install -e . + pip install . working-directory: ${{ env.RECORD_DIRECTORY }} - name: Azure login (non pull_request workflow) if: github.event_name != 'pull_request' @@ -142,6 +144,7 @@ jobs: run: | Set-PSDebug -Trace 1 pip uninstall -y promptflow promptflow-sdk promptflow-tools + pip install ${{ github.workspace }}/src/promptflow-devkit gci ./promptflow -Recurse | % {if ($_.Name.Contains('.whl')) {python -m pip install "$($_.FullName)[azure]"}} gci ./promptflow-tools -Recurse | % {if ($_.Name.Contains('.whl')) {python -m pip install $_.FullName}} pip freeze diff --git a/.github/workflows/sdk-cli-azure-test-production.yml b/.github/workflows/sdk-cli-azure-test-production.yml index 89d96f4ff9f..1234860caf0 100644 --- a/.github/workflows/sdk-cli-azure-test-production.yml +++ b/.github/workflows/sdk-cli-azure-test-production.yml @@ -89,6 +89,8 @@ jobs: pip install -r ${{ github.workspace }}/src/promptflow/dev_requirements.txt pip install ${{ github.workspace }}/src/promptflow-tracing pip install ${{ github.workspace }}/src/promptflow-core + pip install ${{ github.workspace }}/src/promptflow-devkit + pip install ${{ github.workspace }}/src/promptflow-azure gci ./promptflow -Recurse | % {if ($_.Name.Contains('.whl')) {python -m pip install "$($_.FullName)[azure]"}} gci ./promptflow-tools -Recurse | % {if ($_.Name.Contains('.whl')) {python -m pip install $_.FullName}} pip freeze diff --git a/.github/workflows/sdk-cli-azure-test-pull-request.yml b/.github/workflows/sdk-cli-azure-test-pull-request.yml index 2955d499d98..c509eceb3d5 100644 --- a/.github/workflows/sdk-cli-azure-test-pull-request.yml +++ b/.github/workflows/sdk-cli-azure-test-pull-request.yml @@ -7,6 +7,7 @@ on: pull_request: paths: - src/promptflow-core/** + - src/promptflow-devkit/** - src/promptflow/** - scripts/building/** - src/promptflow-tracing/** @@ -89,6 +90,8 @@ jobs: pip install -r ${{ github.workspace }}/src/promptflow/dev_requirements.txt pip install ${{ github.workspace }}/src/promptflow-tracing pip install ${{ github.workspace }}/src/promptflow-core + pip install ${{ github.workspace }}/src/promptflow-devkit + pip install ${{ github.workspace }}/src/promptflow-azure gci ./promptflow -Recurse | % {if ($_.Name.Contains('.whl')) {python -m pip install "$($_.FullName)[azure]"}} gci ./promptflow-tools -Recurse | % {if ($_.Name.Contains('.whl')) {python -m pip install $_.FullName}} pip freeze diff --git a/.github/workflows/sdk-cli-azure-test.yml b/.github/workflows/sdk-cli-azure-test.yml index a11becbc194..f1f950a7a3a 100644 --- a/.github/workflows/sdk-cli-azure-test.yml +++ b/.github/workflows/sdk-cli-azure-test.yml @@ -88,6 +88,8 @@ jobs: pip install -r ${{ github.workspace }}/src/promptflow/dev_requirements.txt pip install ${{ github.workspace }}/src/promptflow-tracing pip install ${{ github.workspace }}/src/promptflow-core + pip install ${{ github.workspace }}/src/promptflow-devkit + pip install ${{ github.workspace }}/src/promptflow-azure gci ./promptflow -Recurse | % {if ($_.Name.Contains('.whl')) {python -m pip install "$($_.FullName)[azure]"}} gci ./promptflow-tools -Recurse | % {if ($_.Name.Contains('.whl')) {python -m pip install $_.FullName}} pip freeze diff --git a/.github/workflows/sdk-cli-perf-monitor-test.yml b/.github/workflows/sdk-cli-perf-monitor-test.yml index 46ee641326a..f3aa9f2f821 100644 --- a/.github/workflows/sdk-cli-perf-monitor-test.yml +++ b/.github/workflows/sdk-cli-perf-monitor-test.yml @@ -7,6 +7,8 @@ on: pull_request: paths: - src/promptflow/** + - src/promptflow-core/** + - src/promptflow-devkit/** - scripts/building/** - .github/workflows/sdk-cli-perf-monitor-test.yml @@ -81,7 +83,9 @@ jobs: pip install -r ${{ github.workspace }}/src/promptflow/dev_requirements.txt pip install ${{ github.workspace }}/src/promptflow-tracing pip install ${{ github.workspace }}/src/promptflow-core - gci ./promptflow -Recurse | % {if ($_.Name.Contains('.whl')) {python -m pip install "$($_.FullName)[azure,executable,azureml-serving]"}} + pip install ${{ github.workspace }}/src/promptflow-devkit + pip install ${{ github.workspace }}/src/promptflow-azure + gci ./promptflow -Recurse | % {if ($_.Name.Contains('.whl')) {python -m pip install "$($_.FullName)[all]"}} gci ./promptflow-tools -Recurse | % {if ($_.Name.Contains('.whl')) {python -m pip install $_.FullName}} pip freeze diff --git a/.gitignore b/.gitignore index 74df3834b44..ea50b90eae5 100644 --- a/.gitignore +++ b/.gitignore @@ -165,7 +165,6 @@ cython_debug/ # ignore !flow.tools.json -**/.promptflow/* .runs connection.json .env diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 94cab9a9934..419c1cc7684 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,7 +1,7 @@ # See https://pre-commit.com for more information # See https://pre-commit.com/hooks.html for more hooks -exclude: '(^docs/)|flows|scripts|src/promptflow/promptflow/azure/_restclient/|src/promptflow-core/promptflow/core/_connection_provider/_models/|src/promptflow/promptflow/azure/_models/|src/promptflow/tests/test_configs|src/promptflow-tools' +exclude: '(^docs/)|flows|scripts|src/promptflow-azure/promptflow/azure/_restclient/|src/promptflow-core/promptflow/core/_connection_provider/_models/|src/promptflow-azure/promptflow/azure/_models/|src/promptflow/tests/test_configs|src/promptflow-tools' repos: - repo: https://github.com/pre-commit/pre-commit-hooks diff --git a/scripts/check_enforcer/check_enforcer.py b/scripts/check_enforcer/check_enforcer.py index 6755b95f77d..b1a3bf08659 100644 --- a/scripts/check_enforcer/check_enforcer.py +++ b/scripts/check_enforcer/check_enforcer.py @@ -47,11 +47,11 @@ "scripts/building/**", ".github/workflows/promptflow-sdk-cli-test.yml", ], - "sdk_cli_global_config_tests": [ - "src/promptflow/**", - "scripts/building/**", - ".github/workflows/promptflow-global-config-test.yml", - ], + # "sdk_cli_global_config_tests": [ + # "src/promptflow/**", + # "scripts/building/**", + # ".github/workflows/promptflow-global-config-test.yml", + # ], "sdk_cli_azure_test_replay": [ "src/promptflow/**", "scripts/building/**", diff --git a/scripts/compliance-check/user_exclusion.xml b/scripts/compliance-check/user_exclusion.xml index 24044e16b19..73646e29452 100644 --- a/scripts/compliance-check/user_exclusion.xml +++ b/scripts/compliance-check/user_exclusion.xml @@ -3,5 +3,5 @@ SRC\PROMPTFLOW-CORE\PROMPTFLOW\CORE\_SERVING\STATIC\INDEX.JS .MIN.JS - SRC\PROMPTFLOW\PROMPTFLOW\_SDK\_SERVICE\STATIC\ + SRC\PROMPTFLOW-DEVKIT\PROMPTFLOW\_SDK\_SERVICE\STATIC\ diff --git a/scripts/dev-setup/main.py b/scripts/dev-setup/main.py index 5203faa79cd..667eeb2e9da 100644 --- a/scripts/dev-setup/main.py +++ b/scripts/dev-setup/main.py @@ -15,9 +15,8 @@ PROMPT_FLOW_PKGS = [ "promptflow-tracing", "promptflow-core", - # TODO: uncomment below lines when the packages are ready - # "promptflow-devkit", - # "promptflow-azure", + "promptflow-devkit", + "promptflow-azure", "promptflow[azure]", "promptflow-tools", ] diff --git a/setup.cfg b/setup.cfg index 1a6b19b1dc7..a35c3e642ab 100644 --- a/setup.cfg +++ b/setup.cfg @@ -11,8 +11,8 @@ exclude = docs/* venv,.pytest_cache build - src/promptflow/promptflow/azure/_restclient - src/promptflow/promptflow/azure/_models + src/promptflow-azure/promptflow/azure/_restclient + src/promptflow-azure/promptflow/azure/_models src/promptflow-core/promptflow/core/_connection_provider/_models src/promptflow/tests/test_configs/* import-order-style = google diff --git a/src/promptflow-azure/promptflow/azure/__init__.py b/src/promptflow-azure/promptflow/azure/__init__.py index 555fb331eb2..fcf0ebcdceb 100644 --- a/src/promptflow-azure/promptflow/azure/__init__.py +++ b/src/promptflow-azure/promptflow/azure/__init__.py @@ -2,6 +2,8 @@ # Copyright (c) Microsoft Corporation. All rights reserved. # --------------------------------------------------------- -from ._version import __version__ +__path__ = __import__("pkgutil").extend_path(__path__, __name__) # type: ignore -__all__ = ["__version__"] +from ._pf_client import PFClient + +__all__ = ["PFClient"] diff --git a/src/promptflow/promptflow/_cli/__init__.py b/src/promptflow-azure/promptflow/azure/_cli/__init__.py similarity index 100% rename from src/promptflow/promptflow/_cli/__init__.py rename to src/promptflow-azure/promptflow/azure/_cli/__init__.py diff --git a/src/promptflow/promptflow/azure/_cli/_connection.py b/src/promptflow-azure/promptflow/azure/_cli/_connection.py similarity index 100% rename from src/promptflow/promptflow/azure/_cli/_connection.py rename to src/promptflow-azure/promptflow/azure/_cli/_connection.py diff --git a/src/promptflow/promptflow/azure/_cli/_flow.py b/src/promptflow-azure/promptflow/azure/_cli/_flow.py similarity index 100% rename from src/promptflow/promptflow/azure/_cli/_flow.py rename to src/promptflow-azure/promptflow/azure/_cli/_flow.py diff --git a/src/promptflow/promptflow/azure/_cli/_run.py b/src/promptflow-azure/promptflow/azure/_cli/_run.py similarity index 100% rename from src/promptflow/promptflow/azure/_cli/_run.py rename to src/promptflow-azure/promptflow/azure/_cli/_run.py diff --git a/src/promptflow/promptflow/azure/_cli/_utils.py b/src/promptflow-azure/promptflow/azure/_cli/_utils.py similarity index 100% rename from src/promptflow/promptflow/azure/_cli/_utils.py rename to src/promptflow-azure/promptflow/azure/_cli/_utils.py diff --git a/src/promptflow/promptflow/azure/_cli/entry.py b/src/promptflow-azure/promptflow/azure/_cli/entry.py similarity index 100% rename from src/promptflow/promptflow/azure/_cli/entry.py rename to src/promptflow-azure/promptflow/azure/_cli/entry.py diff --git a/src/promptflow/promptflow/azure/_constants/__init__.py b/src/promptflow-azure/promptflow/azure/_constants/__init__.py similarity index 100% rename from src/promptflow/promptflow/azure/_constants/__init__.py rename to src/promptflow-azure/promptflow/azure/_constants/__init__.py diff --git a/src/promptflow/promptflow/azure/_constants/_component.py b/src/promptflow-azure/promptflow/azure/_constants/_component.py similarity index 100% rename from src/promptflow/promptflow/azure/_constants/_component.py rename to src/promptflow-azure/promptflow/azure/_constants/_component.py diff --git a/src/promptflow/promptflow/azure/_constants/_flow.py b/src/promptflow-azure/promptflow/azure/_constants/_flow.py similarity index 100% rename from src/promptflow/promptflow/azure/_constants/_flow.py rename to src/promptflow-azure/promptflow/azure/_constants/_flow.py diff --git a/src/promptflow/promptflow/_cli/_pf/__init__.py b/src/promptflow-azure/promptflow/azure/_entities/__init__.py similarity index 100% rename from src/promptflow/promptflow/_cli/_pf/__init__.py rename to src/promptflow-azure/promptflow/azure/_entities/__init__.py diff --git a/src/promptflow/promptflow/azure/_entities/_flow.py b/src/promptflow-azure/promptflow/azure/_entities/_flow.py similarity index 100% rename from src/promptflow/promptflow/azure/_entities/_flow.py rename to src/promptflow-azure/promptflow/azure/_entities/_flow.py diff --git a/src/promptflow/promptflow/azure/_entities/_workspace_connection_spec.py b/src/promptflow-azure/promptflow/azure/_entities/_workspace_connection_spec.py similarity index 100% rename from src/promptflow/promptflow/azure/_entities/_workspace_connection_spec.py rename to src/promptflow-azure/promptflow/azure/_entities/_workspace_connection_spec.py diff --git a/src/promptflow/promptflow/azure/_load_functions.py b/src/promptflow-azure/promptflow/azure/_load_functions.py similarity index 100% rename from src/promptflow/promptflow/azure/_load_functions.py rename to src/promptflow-azure/promptflow/azure/_load_functions.py diff --git a/src/promptflow/promptflow/azure/_ml/__init__.py b/src/promptflow-azure/promptflow/azure/_ml/__init__.py similarity index 100% rename from src/promptflow/promptflow/azure/_ml/__init__.py rename to src/promptflow-azure/promptflow/azure/_ml/__init__.py diff --git a/src/promptflow/promptflow/azure/_pf_client.py b/src/promptflow-azure/promptflow/azure/_pf_client.py similarity index 100% rename from src/promptflow/promptflow/azure/_pf_client.py rename to src/promptflow-azure/promptflow/azure/_pf_client.py diff --git a/src/promptflow/promptflow/azure/_restclient/README.md b/src/promptflow-azure/promptflow/azure/_restclient/README.md similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/README.md rename to src/promptflow-azure/promptflow/azure/_restclient/README.md diff --git a/src/promptflow/promptflow/azure/_restclient/__init__.py b/src/promptflow-azure/promptflow/azure/_restclient/__init__.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/__init__.py rename to src/promptflow-azure/promptflow/azure/_restclient/__init__.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/__init__.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/__init__.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/__init__.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/__init__.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/_azure_machine_learning_designer_service_client.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/_azure_machine_learning_designer_service_client.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/_azure_machine_learning_designer_service_client.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/_azure_machine_learning_designer_service_client.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/_configuration.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/_configuration.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/_configuration.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/_configuration.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/_patch.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/_patch.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/_patch.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/_patch.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/_vendor.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/_vendor.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/_vendor.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/_vendor.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/aio/__init__.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/aio/__init__.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/aio/__init__.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/aio/__init__.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/aio/_azure_machine_learning_designer_service_client.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/aio/_azure_machine_learning_designer_service_client.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/aio/_azure_machine_learning_designer_service_client.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/aio/_azure_machine_learning_designer_service_client.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/aio/_configuration.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/aio/_configuration.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/aio/_configuration.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/aio/_configuration.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/aio/_patch.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/aio/_patch.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/aio/_patch.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/aio/_patch.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/aio/operations/__init__.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/aio/operations/__init__.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/aio/operations/__init__.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/aio/operations/__init__.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/aio/operations/_bulk_runs_operations.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/aio/operations/_bulk_runs_operations.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/aio/operations/_bulk_runs_operations.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/aio/operations/_bulk_runs_operations.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/aio/operations/_connection_operations.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/aio/operations/_connection_operations.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/aio/operations/_connection_operations.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/aio/operations/_connection_operations.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/aio/operations/_connections_operations.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/aio/operations/_connections_operations.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/aio/operations/_connections_operations.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/aio/operations/_connections_operations.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/aio/operations/_experiment_templates_operations.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/aio/operations/_experiment_templates_operations.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/aio/operations/_experiment_templates_operations.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/aio/operations/_experiment_templates_operations.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/aio/operations/_experiments_operations.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/aio/operations/_experiments_operations.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/aio/operations/_experiments_operations.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/aio/operations/_experiments_operations.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/aio/operations/_flow_runs_admin_operations.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/aio/operations/_flow_runs_admin_operations.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/aio/operations/_flow_runs_admin_operations.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/aio/operations/_flow_runs_admin_operations.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/aio/operations/_flow_runtimes_operations.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/aio/operations/_flow_runtimes_operations.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/aio/operations/_flow_runtimes_operations.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/aio/operations/_flow_runtimes_operations.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/aio/operations/_flow_runtimes_workspace_independent_operations.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/aio/operations/_flow_runtimes_workspace_independent_operations.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/aio/operations/_flow_runtimes_workspace_independent_operations.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/aio/operations/_flow_runtimes_workspace_independent_operations.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/aio/operations/_flow_sessions_admin_operations.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/aio/operations/_flow_sessions_admin_operations.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/aio/operations/_flow_sessions_admin_operations.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/aio/operations/_flow_sessions_admin_operations.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/aio/operations/_flow_sessions_operations.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/aio/operations/_flow_sessions_operations.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/aio/operations/_flow_sessions_operations.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/aio/operations/_flow_sessions_operations.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/aio/operations/_flows_operations.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/aio/operations/_flows_operations.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/aio/operations/_flows_operations.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/aio/operations/_flows_operations.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/aio/operations/_flows_provider_operations.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/aio/operations/_flows_provider_operations.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/aio/operations/_flows_provider_operations.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/aio/operations/_flows_provider_operations.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/aio/operations/_tools_operations.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/aio/operations/_tools_operations.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/aio/operations/_tools_operations.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/aio/operations/_tools_operations.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/aio/operations/_trace_sessions_operations.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/aio/operations/_trace_sessions_operations.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/aio/operations/_trace_sessions_operations.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/aio/operations/_trace_sessions_operations.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/models/__init__.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/models/__init__.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/models/__init__.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/models/__init__.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/models/_azure_machine_learning_designer_service_client_enums.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/models/_azure_machine_learning_designer_service_client_enums.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/models/_azure_machine_learning_designer_service_client_enums.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/models/_azure_machine_learning_designer_service_client_enums.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/models/_models.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/models/_models.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/models/_models.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/models/_models.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/models/_models_py3.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/models/_models_py3.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/models/_models_py3.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/models/_models_py3.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/operations/__init__.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/operations/__init__.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/operations/__init__.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/operations/__init__.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/operations/_bulk_runs_operations.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/operations/_bulk_runs_operations.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/operations/_bulk_runs_operations.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/operations/_bulk_runs_operations.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/operations/_connection_operations.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/operations/_connection_operations.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/operations/_connection_operations.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/operations/_connection_operations.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/operations/_connections_operations.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/operations/_connections_operations.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/operations/_connections_operations.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/operations/_connections_operations.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/operations/_experiment_templates_operations.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/operations/_experiment_templates_operations.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/operations/_experiment_templates_operations.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/operations/_experiment_templates_operations.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/operations/_experiments_operations.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/operations/_experiments_operations.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/operations/_experiments_operations.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/operations/_experiments_operations.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/operations/_flow_runs_admin_operations.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/operations/_flow_runs_admin_operations.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/operations/_flow_runs_admin_operations.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/operations/_flow_runs_admin_operations.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/operations/_flow_runtimes_operations.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/operations/_flow_runtimes_operations.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/operations/_flow_runtimes_operations.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/operations/_flow_runtimes_operations.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/operations/_flow_runtimes_workspace_independent_operations.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/operations/_flow_runtimes_workspace_independent_operations.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/operations/_flow_runtimes_workspace_independent_operations.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/operations/_flow_runtimes_workspace_independent_operations.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/operations/_flow_sessions_admin_operations.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/operations/_flow_sessions_admin_operations.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/operations/_flow_sessions_admin_operations.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/operations/_flow_sessions_admin_operations.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/operations/_flow_sessions_operations.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/operations/_flow_sessions_operations.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/operations/_flow_sessions_operations.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/operations/_flow_sessions_operations.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/operations/_flows_operations.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/operations/_flows_operations.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/operations/_flows_operations.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/operations/_flows_operations.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/operations/_flows_provider_operations.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/operations/_flows_provider_operations.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/operations/_flows_provider_operations.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/operations/_flows_provider_operations.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/operations/_tools_operations.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/operations/_tools_operations.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/operations/_tools_operations.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/operations/_tools_operations.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/operations/_trace_sessions_operations.py b/src/promptflow-azure/promptflow/azure/_restclient/flow/operations/_trace_sessions_operations.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/operations/_trace_sessions_operations.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow/operations/_trace_sessions_operations.py diff --git a/src/promptflow/promptflow/azure/_restclient/flow/py.typed b/src/promptflow-azure/promptflow/azure/_restclient/flow/py.typed similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow/py.typed rename to src/promptflow-azure/promptflow/azure/_restclient/flow/py.typed diff --git a/src/promptflow/promptflow/azure/_restclient/flow_service_caller.py b/src/promptflow-azure/promptflow/azure/_restclient/flow_service_caller.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/flow_service_caller.py rename to src/promptflow-azure/promptflow/azure/_restclient/flow_service_caller.py diff --git a/src/promptflow/promptflow/azure/_restclient/service_caller_factory.py b/src/promptflow-azure/promptflow/azure/_restclient/service_caller_factory.py similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/service_caller_factory.py rename to src/promptflow-azure/promptflow/azure/_restclient/service_caller_factory.py diff --git a/src/promptflow/promptflow/azure/_restclient/swagger.json b/src/promptflow-azure/promptflow/azure/_restclient/swagger.json similarity index 100% rename from src/promptflow/promptflow/azure/_restclient/swagger.json rename to src/promptflow-azure/promptflow/azure/_restclient/swagger.json diff --git a/src/promptflow/promptflow/_sdk/__init__.py b/src/promptflow-azure/promptflow/azure/_schemas/__init__.py similarity index 100% rename from src/promptflow/promptflow/_sdk/__init__.py rename to src/promptflow-azure/promptflow/azure/_schemas/__init__.py diff --git a/src/promptflow/promptflow/azure/_schemas/_flow_schema.py b/src/promptflow-azure/promptflow/azure/_schemas/_flow_schema.py similarity index 100% rename from src/promptflow/promptflow/azure/_schemas/_flow_schema.py rename to src/promptflow-azure/promptflow/azure/_schemas/_flow_schema.py diff --git a/src/promptflow/promptflow/azure/_storage/__init__.py b/src/promptflow-azure/promptflow/azure/_storage/__init__.py similarity index 100% rename from src/promptflow/promptflow/azure/_storage/__init__.py rename to src/promptflow-azure/promptflow/azure/_storage/__init__.py diff --git a/src/promptflow/promptflow/azure/_storage/cosmosdb/__init__.py b/src/promptflow-azure/promptflow/azure/_storage/cosmosdb/__init__.py similarity index 100% rename from src/promptflow/promptflow/azure/_storage/cosmosdb/__init__.py rename to src/promptflow-azure/promptflow/azure/_storage/cosmosdb/__init__.py diff --git a/src/promptflow/promptflow/azure/_storage/cosmosdb/client.py b/src/promptflow-azure/promptflow/azure/_storage/cosmosdb/client.py similarity index 100% rename from src/promptflow/promptflow/azure/_storage/cosmosdb/client.py rename to src/promptflow-azure/promptflow/azure/_storage/cosmosdb/client.py diff --git a/src/promptflow/promptflow/azure/_storage/cosmosdb/collection.py b/src/promptflow-azure/promptflow/azure/_storage/cosmosdb/collection.py similarity index 100% rename from src/promptflow/promptflow/azure/_storage/cosmosdb/collection.py rename to src/promptflow-azure/promptflow/azure/_storage/cosmosdb/collection.py diff --git a/src/promptflow/promptflow/azure/_storage/cosmosdb/cosmosdb_utils.py b/src/promptflow-azure/promptflow/azure/_storage/cosmosdb/cosmosdb_utils.py similarity index 100% rename from src/promptflow/promptflow/azure/_storage/cosmosdb/cosmosdb_utils.py rename to src/promptflow-azure/promptflow/azure/_storage/cosmosdb/cosmosdb_utils.py diff --git a/src/promptflow/promptflow/azure/_storage/cosmosdb/span.py b/src/promptflow-azure/promptflow/azure/_storage/cosmosdb/span.py similarity index 100% rename from src/promptflow/promptflow/azure/_storage/cosmosdb/span.py rename to src/promptflow-azure/promptflow/azure/_storage/cosmosdb/span.py diff --git a/src/promptflow/promptflow/azure/_storage/cosmosdb/summary.py b/src/promptflow-azure/promptflow/azure/_storage/cosmosdb/summary.py similarity index 100% rename from src/promptflow/promptflow/azure/_storage/cosmosdb/summary.py rename to src/promptflow-azure/promptflow/azure/_storage/cosmosdb/summary.py diff --git a/src/promptflow/promptflow/azure/_utils/__init__.py b/src/promptflow-azure/promptflow/azure/_utils/__init__.py similarity index 100% rename from src/promptflow/promptflow/azure/_utils/__init__.py rename to src/promptflow-azure/promptflow/azure/_utils/__init__.py diff --git a/src/promptflow/promptflow/azure/_utils/_tracing.py b/src/promptflow-azure/promptflow/azure/_utils/_tracing.py similarity index 100% rename from src/promptflow/promptflow/azure/_utils/_tracing.py rename to src/promptflow-azure/promptflow/azure/_utils/_tracing.py diff --git a/src/promptflow/promptflow/azure/_utils/_url_utils.py b/src/promptflow-azure/promptflow/azure/_utils/_url_utils.py similarity index 100% rename from src/promptflow/promptflow/azure/_utils/_url_utils.py rename to src/promptflow-azure/promptflow/azure/_utils/_url_utils.py diff --git a/src/promptflow/promptflow/azure/_utils/general.py b/src/promptflow-azure/promptflow/azure/_utils/general.py similarity index 100% rename from src/promptflow/promptflow/azure/_utils/general.py rename to src/promptflow-azure/promptflow/azure/_utils/general.py diff --git a/src/promptflow-azure/promptflow/azure/_version.py b/src/promptflow-azure/promptflow/azure/_version.py deleted file mode 100644 index e3acf771296..00000000000 --- a/src/promptflow-azure/promptflow/azure/_version.py +++ /dev/null @@ -1,7 +0,0 @@ -# --------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# --------------------------------------------------------- - -import importlib.metadata - -__version__ = importlib.metadata.version("promptflow-azure") diff --git a/src/promptflow/promptflow/azure/operations/__init__.py b/src/promptflow-azure/promptflow/azure/operations/__init__.py similarity index 100% rename from src/promptflow/promptflow/azure/operations/__init__.py rename to src/promptflow-azure/promptflow/azure/operations/__init__.py diff --git a/src/promptflow/promptflow/azure/operations/_arm_connection_operations.py b/src/promptflow-azure/promptflow/azure/operations/_arm_connection_operations.py similarity index 100% rename from src/promptflow/promptflow/azure/operations/_arm_connection_operations.py rename to src/promptflow-azure/promptflow/azure/operations/_arm_connection_operations.py diff --git a/src/promptflow/promptflow/azure/operations/_artifact_utilities.py b/src/promptflow-azure/promptflow/azure/operations/_artifact_utilities.py similarity index 100% rename from src/promptflow/promptflow/azure/operations/_artifact_utilities.py rename to src/promptflow-azure/promptflow/azure/operations/_artifact_utilities.py diff --git a/src/promptflow/promptflow/azure/operations/_async_run_downloader.py b/src/promptflow-azure/promptflow/azure/operations/_async_run_downloader.py similarity index 100% rename from src/promptflow/promptflow/azure/operations/_async_run_downloader.py rename to src/promptflow-azure/promptflow/azure/operations/_async_run_downloader.py diff --git a/src/promptflow/promptflow/azure/operations/_connection_operations.py b/src/promptflow-azure/promptflow/azure/operations/_connection_operations.py similarity index 100% rename from src/promptflow/promptflow/azure/operations/_connection_operations.py rename to src/promptflow-azure/promptflow/azure/operations/_connection_operations.py diff --git a/src/promptflow/promptflow/azure/operations/_fileshare_storeage_helper.py b/src/promptflow-azure/promptflow/azure/operations/_fileshare_storeage_helper.py similarity index 100% rename from src/promptflow/promptflow/azure/operations/_fileshare_storeage_helper.py rename to src/promptflow-azure/promptflow/azure/operations/_fileshare_storeage_helper.py diff --git a/src/promptflow/promptflow/azure/operations/_flow_operations.py b/src/promptflow-azure/promptflow/azure/operations/_flow_operations.py similarity index 100% rename from src/promptflow/promptflow/azure/operations/_flow_operations.py rename to src/promptflow-azure/promptflow/azure/operations/_flow_operations.py diff --git a/src/promptflow/promptflow/azure/operations/_run_operations.py b/src/promptflow-azure/promptflow/azure/operations/_run_operations.py similarity index 100% rename from src/promptflow/promptflow/azure/operations/_run_operations.py rename to src/promptflow-azure/promptflow/azure/operations/_run_operations.py diff --git a/src/promptflow/promptflow/azure/operations/_trace_operations.py b/src/promptflow-azure/promptflow/azure/operations/_trace_operations.py similarity index 100% rename from src/promptflow/promptflow/azure/operations/_trace_operations.py rename to src/promptflow-azure/promptflow/azure/operations/_trace_operations.py diff --git a/src/promptflow/promptflow/azure/resources/component_spec_template.yaml b/src/promptflow-azure/promptflow/azure/resources/component_spec_template.yaml similarity index 100% rename from src/promptflow/promptflow/azure/resources/component_spec_template.yaml rename to src/promptflow-azure/promptflow/azure/resources/component_spec_template.yaml diff --git a/src/promptflow-azure/pyproject.toml b/src/promptflow-azure/pyproject.toml index ac8c409b00c..4b12b2b116f 100644 --- a/src/promptflow-azure/pyproject.toml +++ b/src/promptflow-azure/pyproject.toml @@ -2,6 +2,9 @@ name = "promptflow-azure" version = "0.1.0b1" description = "Prompt flow azure" +include = [ + "promptflow/azure/resources/*" +] license = "MIT" @@ -36,10 +39,18 @@ packages = [ [tool.poetry.dependencies] python = "<4.0,>=3.8" +azure-core = ">=1.26.4,<2.0.0" +"azure-storage-blob[aio]" = ">=12.17.0,<13.0.0" # add [aio] for async run download feature +azure-identity = ">=1.12.0,<2.0.0" +azure-ai-ml = ">=1.14.0,<2.0.0" +azure-cosmos = ">=4.5.1,<5.0.0" # used to upload trace to cloud +pyjwt = ">=2.4.0,<3.0.0" # requirement of control plane SDK +promptflow-devkit = "<2.0.0" [tool.poetry.group.dev.dependencies] pre-commit = "*" import-linter = "*" +promptflow-devkit = { path = "../promptflow-devkit" } [tool.poetry.group.test.dependencies] pytest = "*" @@ -50,6 +61,9 @@ pytest-xdist = "*" requires = ["poetry-core>=1.5.0"] build-backend = "poetry.core.masonry.api" +[tool.poetry.scripts] +pfazure = "promptflow.azure._cli.entry:main" + [tool.pytest.ini_options] markers = [ "unittest", diff --git a/src/promptflow/promptflow/contracts/__init__.py b/src/promptflow-core/promptflow/contracts/__init__.py similarity index 100% rename from src/promptflow/promptflow/contracts/__init__.py rename to src/promptflow-core/promptflow/contracts/__init__.py diff --git a/src/promptflow/promptflow/contracts/_errors.py b/src/promptflow-core/promptflow/contracts/_errors.py similarity index 100% rename from src/promptflow/promptflow/contracts/_errors.py rename to src/promptflow-core/promptflow/contracts/_errors.py diff --git a/src/promptflow/promptflow/contracts/_run_management.py b/src/promptflow-core/promptflow/contracts/_run_management.py similarity index 100% rename from src/promptflow/promptflow/contracts/_run_management.py rename to src/promptflow-core/promptflow/contracts/_run_management.py diff --git a/src/promptflow/promptflow/contracts/flow.py b/src/promptflow-core/promptflow/contracts/flow.py similarity index 100% rename from src/promptflow/promptflow/contracts/flow.py rename to src/promptflow-core/promptflow/contracts/flow.py diff --git a/src/promptflow/promptflow/contracts/multimedia.py b/src/promptflow-core/promptflow/contracts/multimedia.py similarity index 100% rename from src/promptflow/promptflow/contracts/multimedia.py rename to src/promptflow-core/promptflow/contracts/multimedia.py diff --git a/src/promptflow/promptflow/contracts/run_info.py b/src/promptflow-core/promptflow/contracts/run_info.py similarity index 100% rename from src/promptflow/promptflow/contracts/run_info.py rename to src/promptflow-core/promptflow/contracts/run_info.py diff --git a/src/promptflow/promptflow/contracts/run_mode.py b/src/promptflow-core/promptflow/contracts/run_mode.py similarity index 100% rename from src/promptflow/promptflow/contracts/run_mode.py rename to src/promptflow-core/promptflow/contracts/run_mode.py diff --git a/src/promptflow/promptflow/contracts/tool.py b/src/promptflow-core/promptflow/contracts/tool.py similarity index 100% rename from src/promptflow/promptflow/contracts/tool.py rename to src/promptflow-core/promptflow/contracts/tool.py diff --git a/src/promptflow/promptflow/contracts/types.py b/src/promptflow-core/promptflow/contracts/types.py similarity index 100% rename from src/promptflow/promptflow/contracts/types.py rename to src/promptflow-core/promptflow/contracts/types.py diff --git a/src/promptflow-core/pyproject.toml b/src/promptflow-core/pyproject.toml index 99c8e54a328..0f7f6a904d9 100644 --- a/src/promptflow-core/pyproject.toml +++ b/src/promptflow-core/pyproject.toml @@ -54,6 +54,7 @@ executor-service = ["fastapi"] [tool.poetry.group.dev.dependencies] pre-commit = "*" import-linter = "*" +promptflow-tracing = { path = "../promptflow-tracing" } [tool.poetry.group.test.dependencies] pytest = "*" @@ -74,11 +75,6 @@ markers = [ # durations - list the slowest test durations addopts = """ --junit-xml=test-results.xml \ ---cov=promptflow \ ---cov-config=pyproject.toml \ ---cov-report=term \ ---cov-report=html \ ---cov-report=xml \ --dist loadfile \ --log-level=info \ --log-format="%(asctime)s %(levelname)s %(message)s" \ diff --git a/src/promptflow-devkit/pf b/src/promptflow-devkit/pf new file mode 100644 index 00000000000..333a91a041d --- /dev/null +++ b/src/promptflow-devkit/pf @@ -0,0 +1,10 @@ +#!/usr/bin/env python + +import sys +import os + +def main(): + if os.environ.get('PF_INSTALLER') is None: + os.environ['PF_INSTALLER'] = 'PIP' + + os.execl(sys.executable, sys.executable, '-m', 'promptflow._cli._pf.entry', *sys.argv[1:]) diff --git a/src/promptflow/promptflow/_sdk/_connection_provider/__init__.py b/src/promptflow-devkit/promptflow/_cli/__init__.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_connection_provider/__init__.py rename to src/promptflow-devkit/promptflow/_cli/__init__.py diff --git a/src/promptflow/promptflow/_cli/_params.py b/src/promptflow-devkit/promptflow/_cli/_params.py similarity index 100% rename from src/promptflow/promptflow/_cli/_params.py rename to src/promptflow-devkit/promptflow/_cli/_params.py diff --git a/src/promptflow/promptflow/_sdk/_service/apis/__init__.py b/src/promptflow-devkit/promptflow/_cli/_pf/__init__.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_service/apis/__init__.py rename to src/promptflow-devkit/promptflow/_cli/_pf/__init__.py diff --git a/src/promptflow/promptflow/_cli/_pf/_config.py b/src/promptflow-devkit/promptflow/_cli/_pf/_config.py similarity index 100% rename from src/promptflow/promptflow/_cli/_pf/_config.py rename to src/promptflow-devkit/promptflow/_cli/_pf/_config.py diff --git a/src/promptflow/promptflow/_cli/_pf/_connection.py b/src/promptflow-devkit/promptflow/_cli/_pf/_connection.py similarity index 100% rename from src/promptflow/promptflow/_cli/_pf/_connection.py rename to src/promptflow-devkit/promptflow/_cli/_pf/_connection.py diff --git a/src/promptflow/promptflow/_cli/_pf/_experiment.py b/src/promptflow-devkit/promptflow/_cli/_pf/_experiment.py similarity index 100% rename from src/promptflow/promptflow/_cli/_pf/_experiment.py rename to src/promptflow-devkit/promptflow/_cli/_pf/_experiment.py diff --git a/src/promptflow/promptflow/_cli/_pf/_flow.py b/src/promptflow-devkit/promptflow/_cli/_pf/_flow.py similarity index 100% rename from src/promptflow/promptflow/_cli/_pf/_flow.py rename to src/promptflow-devkit/promptflow/_cli/_pf/_flow.py diff --git a/src/promptflow/promptflow/_cli/_pf/_init_entry_generators.py b/src/promptflow-devkit/promptflow/_cli/_pf/_init_entry_generators.py similarity index 100% rename from src/promptflow/promptflow/_cli/_pf/_init_entry_generators.py rename to src/promptflow-devkit/promptflow/_cli/_pf/_init_entry_generators.py diff --git a/src/promptflow/promptflow/_cli/_pf/_run.py b/src/promptflow-devkit/promptflow/_cli/_pf/_run.py similarity index 100% rename from src/promptflow/promptflow/_cli/_pf/_run.py rename to src/promptflow-devkit/promptflow/_cli/_pf/_run.py diff --git a/src/promptflow/promptflow/_cli/_pf/_tool.py b/src/promptflow-devkit/promptflow/_cli/_pf/_tool.py similarity index 100% rename from src/promptflow/promptflow/_cli/_pf/_tool.py rename to src/promptflow-devkit/promptflow/_cli/_pf/_tool.py diff --git a/src/promptflow/promptflow/_cli/_pf/_upgrade.py b/src/promptflow-devkit/promptflow/_cli/_pf/_upgrade.py similarity index 100% rename from src/promptflow/promptflow/_cli/_pf/_upgrade.py rename to src/promptflow-devkit/promptflow/_cli/_pf/_upgrade.py diff --git a/src/promptflow/promptflow/_cli/_pf/entry.py b/src/promptflow-devkit/promptflow/_cli/_pf/entry.py similarity index 100% rename from src/promptflow/promptflow/_cli/_pf/entry.py rename to src/promptflow-devkit/promptflow/_cli/_pf/entry.py diff --git a/src/promptflow/promptflow/_cli/_pf/help.py b/src/promptflow-devkit/promptflow/_cli/_pf/help.py similarity index 100% rename from src/promptflow/promptflow/_cli/_pf/help.py rename to src/promptflow-devkit/promptflow/_cli/_pf/help.py diff --git a/src/promptflow/promptflow/_cli/_user_agent.py b/src/promptflow-devkit/promptflow/_cli/_user_agent.py similarity index 100% rename from src/promptflow/promptflow/_cli/_user_agent.py rename to src/promptflow-devkit/promptflow/_cli/_user_agent.py diff --git a/src/promptflow/promptflow/_cli/_utils.py b/src/promptflow-devkit/promptflow/_cli/_utils.py similarity index 100% rename from src/promptflow/promptflow/_cli/_utils.py rename to src/promptflow-devkit/promptflow/_cli/_utils.py diff --git a/src/promptflow/promptflow/_cli/data/chat_flow/flow_files/.promptflow/flow.tools.json b/src/promptflow-devkit/promptflow/_cli/data/chat_flow/flow_files/.promptflow/flow.tools.json similarity index 100% rename from src/promptflow/promptflow/_cli/data/chat_flow/flow_files/.promptflow/flow.tools.json rename to src/promptflow-devkit/promptflow/_cli/data/chat_flow/flow_files/.promptflow/flow.tools.json diff --git a/src/promptflow/promptflow/_cli/data/chat_flow/flow_files/README.md b/src/promptflow-devkit/promptflow/_cli/data/chat_flow/flow_files/README.md similarity index 100% rename from src/promptflow/promptflow/_cli/data/chat_flow/flow_files/README.md rename to src/promptflow-devkit/promptflow/_cli/data/chat_flow/flow_files/README.md diff --git a/src/promptflow/promptflow/_cli/data/chat_flow/flow_files/chat.jinja2 b/src/promptflow-devkit/promptflow/_cli/data/chat_flow/flow_files/chat.jinja2 similarity index 100% rename from src/promptflow/promptflow/_cli/data/chat_flow/flow_files/chat.jinja2 rename to src/promptflow-devkit/promptflow/_cli/data/chat_flow/flow_files/chat.jinja2 diff --git a/src/promptflow/promptflow/_cli/data/chat_flow/template/azure_openai.yaml.jinja2 b/src/promptflow-devkit/promptflow/_cli/data/chat_flow/template/azure_openai.yaml.jinja2 similarity index 100% rename from src/promptflow/promptflow/_cli/data/chat_flow/template/azure_openai.yaml.jinja2 rename to src/promptflow-devkit/promptflow/_cli/data/chat_flow/template/azure_openai.yaml.jinja2 diff --git a/src/promptflow/promptflow/_cli/data/chat_flow/template/flow.dag.yaml.jinja2 b/src/promptflow-devkit/promptflow/_cli/data/chat_flow/template/flow.dag.yaml.jinja2 similarity index 100% rename from src/promptflow/promptflow/_cli/data/chat_flow/template/flow.dag.yaml.jinja2 rename to src/promptflow-devkit/promptflow/_cli/data/chat_flow/template/flow.dag.yaml.jinja2 diff --git a/src/promptflow/promptflow/_cli/data/chat_flow/template/openai.yaml.jinja2 b/src/promptflow-devkit/promptflow/_cli/data/chat_flow/template/openai.yaml.jinja2 similarity index 100% rename from src/promptflow/promptflow/_cli/data/chat_flow/template/openai.yaml.jinja2 rename to src/promptflow-devkit/promptflow/_cli/data/chat_flow/template/openai.yaml.jinja2 diff --git a/src/promptflow/promptflow/_cli/data/entry_flow/flow.dag.yaml.jinja2 b/src/promptflow-devkit/promptflow/_cli/data/entry_flow/flow.dag.yaml.jinja2 similarity index 100% rename from src/promptflow/promptflow/_cli/data/entry_flow/flow.dag.yaml.jinja2 rename to src/promptflow-devkit/promptflow/_cli/data/entry_flow/flow.dag.yaml.jinja2 diff --git a/src/promptflow/promptflow/_cli/data/entry_flow/flow.tools.json.jinja2 b/src/promptflow-devkit/promptflow/_cli/data/entry_flow/flow.tools.json.jinja2 similarity index 100% rename from src/promptflow/promptflow/_cli/data/entry_flow/flow.tools.json.jinja2 rename to src/promptflow-devkit/promptflow/_cli/data/entry_flow/flow.tools.json.jinja2 diff --git a/src/promptflow/promptflow/_cli/data/entry_flow/gitignore b/src/promptflow-devkit/promptflow/_cli/data/entry_flow/gitignore similarity index 100% rename from src/promptflow/promptflow/_cli/data/entry_flow/gitignore rename to src/promptflow-devkit/promptflow/_cli/data/entry_flow/gitignore diff --git a/src/promptflow-devkit/promptflow/_cli/data/entry_flow/requirements_txt b/src/promptflow-devkit/promptflow/_cli/data/entry_flow/requirements_txt new file mode 100644 index 00000000000..7a54870cad1 --- /dev/null +++ b/src/promptflow-devkit/promptflow/_cli/data/entry_flow/requirements_txt @@ -0,0 +1 @@ +promptflow diff --git a/src/promptflow/promptflow/_cli/data/entry_flow/tool.py.jinja2 b/src/promptflow-devkit/promptflow/_cli/data/entry_flow/tool.py.jinja2 similarity index 100% rename from src/promptflow/promptflow/_cli/data/entry_flow/tool.py.jinja2 rename to src/promptflow-devkit/promptflow/_cli/data/entry_flow/tool.py.jinja2 diff --git a/src/promptflow/promptflow/_cli/data/evaluation_flow/.promptflow/flow.tools.json b/src/promptflow-devkit/promptflow/_cli/data/evaluation_flow/.promptflow/flow.tools.json similarity index 100% rename from src/promptflow/promptflow/_cli/data/evaluation_flow/.promptflow/flow.tools.json rename to src/promptflow-devkit/promptflow/_cli/data/evaluation_flow/.promptflow/flow.tools.json diff --git a/src/promptflow/promptflow/_cli/data/evaluation_flow/aggregate.py b/src/promptflow-devkit/promptflow/_cli/data/evaluation_flow/aggregate.py similarity index 100% rename from src/promptflow/promptflow/_cli/data/evaluation_flow/aggregate.py rename to src/promptflow-devkit/promptflow/_cli/data/evaluation_flow/aggregate.py diff --git a/src/promptflow/promptflow/_cli/data/evaluation_flow/data.jsonl b/src/promptflow-devkit/promptflow/_cli/data/evaluation_flow/data.jsonl similarity index 100% rename from src/promptflow/promptflow/_cli/data/evaluation_flow/data.jsonl rename to src/promptflow-devkit/promptflow/_cli/data/evaluation_flow/data.jsonl diff --git a/src/promptflow/promptflow/_cli/data/evaluation_flow/flow.dag.yaml b/src/promptflow-devkit/promptflow/_cli/data/evaluation_flow/flow.dag.yaml similarity index 100% rename from src/promptflow/promptflow/_cli/data/evaluation_flow/flow.dag.yaml rename to src/promptflow-devkit/promptflow/_cli/data/evaluation_flow/flow.dag.yaml diff --git a/src/promptflow/promptflow/_cli/data/evaluation_flow/line_process.py b/src/promptflow-devkit/promptflow/_cli/data/evaluation_flow/line_process.py similarity index 100% rename from src/promptflow/promptflow/_cli/data/evaluation_flow/line_process.py rename to src/promptflow-devkit/promptflow/_cli/data/evaluation_flow/line_process.py diff --git a/src/promptflow/promptflow/_cli/data/package_tool/README.md.jinja2 b/src/promptflow-devkit/promptflow/_cli/data/package_tool/README.md.jinja2 similarity index 97% rename from src/promptflow/promptflow/_cli/data/package_tool/README.md.jinja2 rename to src/promptflow-devkit/promptflow/_cli/data/package_tool/README.md.jinja2 index ede780b4f0b..4dbb81b2b2b 100644 --- a/src/promptflow/promptflow/_cli/data/package_tool/README.md.jinja2 +++ b/src/promptflow-devkit/promptflow/_cli/data/package_tool/README.md.jinja2 @@ -11,4 +11,4 @@ The directory structure in the package tool is as follows: __init__.py ``` -Please refer to [tool doc](https://microsoft.github.io/promptflow/how-to-guides/develop-a-tool/index.html) for more details about how to develop a tool. \ No newline at end of file +Please refer to [tool doc](https://microsoft.github.io/promptflow/how-to-guides/develop-a-tool/index.html) for more details about how to develop a tool. diff --git a/src/promptflow/promptflow/_cli/data/package_tool/init.py b/src/promptflow-devkit/promptflow/_cli/data/package_tool/init.py similarity index 100% rename from src/promptflow/promptflow/_cli/data/package_tool/init.py rename to src/promptflow-devkit/promptflow/_cli/data/package_tool/init.py diff --git a/src/promptflow/promptflow/_cli/data/package_tool/setup.py.jinja2 b/src/promptflow-devkit/promptflow/_cli/data/package_tool/setup.py.jinja2 similarity index 100% rename from src/promptflow/promptflow/_cli/data/package_tool/setup.py.jinja2 rename to src/promptflow-devkit/promptflow/_cli/data/package_tool/setup.py.jinja2 diff --git a/src/promptflow/promptflow/_cli/data/package_tool/tool.py.jinja2 b/src/promptflow-devkit/promptflow/_cli/data/package_tool/tool.py.jinja2 similarity index 100% rename from src/promptflow/promptflow/_cli/data/package_tool/tool.py.jinja2 rename to src/promptflow-devkit/promptflow/_cli/data/package_tool/tool.py.jinja2 diff --git a/src/promptflow/promptflow/_cli/data/package_tool/utils.py.jinja2 b/src/promptflow-devkit/promptflow/_cli/data/package_tool/utils.py.jinja2 similarity index 100% rename from src/promptflow/promptflow/_cli/data/package_tool/utils.py.jinja2 rename to src/promptflow-devkit/promptflow/_cli/data/package_tool/utils.py.jinja2 diff --git a/src/promptflow/promptflow/_cli/data/standard_flow/.promptflow/flow.tools.json b/src/promptflow-devkit/promptflow/_cli/data/standard_flow/.promptflow/flow.tools.json similarity index 100% rename from src/promptflow/promptflow/_cli/data/standard_flow/.promptflow/flow.tools.json rename to src/promptflow-devkit/promptflow/_cli/data/standard_flow/.promptflow/flow.tools.json diff --git a/src/promptflow/promptflow/_cli/data/standard_flow/data.jsonl b/src/promptflow-devkit/promptflow/_cli/data/standard_flow/data.jsonl similarity index 100% rename from src/promptflow/promptflow/_cli/data/standard_flow/data.jsonl rename to src/promptflow-devkit/promptflow/_cli/data/standard_flow/data.jsonl diff --git a/src/promptflow/promptflow/_cli/data/standard_flow/flow.dag.yaml b/src/promptflow-devkit/promptflow/_cli/data/standard_flow/flow.dag.yaml similarity index 100% rename from src/promptflow/promptflow/_cli/data/standard_flow/flow.dag.yaml rename to src/promptflow-devkit/promptflow/_cli/data/standard_flow/flow.dag.yaml diff --git a/src/promptflow/promptflow/_cli/data/standard_flow/hello.jinja2 b/src/promptflow-devkit/promptflow/_cli/data/standard_flow/hello.jinja2 similarity index 100% rename from src/promptflow/promptflow/_cli/data/standard_flow/hello.jinja2 rename to src/promptflow-devkit/promptflow/_cli/data/standard_flow/hello.jinja2 diff --git a/src/promptflow/promptflow/_cli/data/standard_flow/hello.py b/src/promptflow-devkit/promptflow/_cli/data/standard_flow/hello.py similarity index 100% rename from src/promptflow/promptflow/_cli/data/standard_flow/hello.py rename to src/promptflow-devkit/promptflow/_cli/data/standard_flow/hello.py diff --git a/src/promptflow/promptflow/_cli/pf.py b/src/promptflow-devkit/promptflow/_cli/pf.py similarity index 100% rename from src/promptflow/promptflow/_cli/pf.py rename to src/promptflow-devkit/promptflow/_cli/pf.py diff --git a/src/promptflow/promptflow/_internal/__init__.py b/src/promptflow-devkit/promptflow/_internal/__init__.py similarity index 100% rename from src/promptflow/promptflow/_internal/__init__.py rename to src/promptflow-devkit/promptflow/_internal/__init__.py diff --git a/src/promptflow/promptflow/_proxy/__init__.py b/src/promptflow-devkit/promptflow/_proxy/__init__.py similarity index 100% rename from src/promptflow/promptflow/_proxy/__init__.py rename to src/promptflow-devkit/promptflow/_proxy/__init__.py diff --git a/src/promptflow/promptflow/_proxy/_base_inspector_proxy.py b/src/promptflow-devkit/promptflow/_proxy/_base_inspector_proxy.py similarity index 100% rename from src/promptflow/promptflow/_proxy/_base_inspector_proxy.py rename to src/promptflow-devkit/promptflow/_proxy/_base_inspector_proxy.py diff --git a/src/promptflow/promptflow/_proxy/_csharp_inspector_proxy.py b/src/promptflow-devkit/promptflow/_proxy/_csharp_inspector_proxy.py similarity index 100% rename from src/promptflow/promptflow/_proxy/_csharp_inspector_proxy.py rename to src/promptflow-devkit/promptflow/_proxy/_csharp_inspector_proxy.py diff --git a/src/promptflow/promptflow/_proxy/_proxy_factory.py b/src/promptflow-devkit/promptflow/_proxy/_proxy_factory.py similarity index 100% rename from src/promptflow/promptflow/_proxy/_proxy_factory.py rename to src/promptflow-devkit/promptflow/_proxy/_proxy_factory.py diff --git a/src/promptflow/promptflow/_proxy/_python_inspector_proxy.py b/src/promptflow-devkit/promptflow/_proxy/_python_inspector_proxy.py similarity index 100% rename from src/promptflow/promptflow/_proxy/_python_inspector_proxy.py rename to src/promptflow-devkit/promptflow/_proxy/_python_inspector_proxy.py diff --git a/src/promptflow/promptflow/_sdk/_service/utils/__init__.py b/src/promptflow-devkit/promptflow/_sdk/__init__.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_service/utils/__init__.py rename to src/promptflow-devkit/promptflow/_sdk/__init__.py diff --git a/src/promptflow/promptflow/_sdk/_configuration.py b/src/promptflow-devkit/promptflow/_sdk/_configuration.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_configuration.py rename to src/promptflow-devkit/promptflow/_sdk/_configuration.py diff --git a/src/promptflow/promptflow/_sdk/_serving/__init__.py b/src/promptflow-devkit/promptflow/_sdk/_connection_provider/__init__.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_serving/__init__.py rename to src/promptflow-devkit/promptflow/_sdk/_connection_provider/__init__.py diff --git a/src/promptflow/promptflow/_sdk/_connection_provider/_local_connection_provider.py b/src/promptflow-devkit/promptflow/_sdk/_connection_provider/_local_connection_provider.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_connection_provider/_local_connection_provider.py rename to src/promptflow-devkit/promptflow/_sdk/_connection_provider/_local_connection_provider.py diff --git a/src/promptflow/promptflow/_sdk/_constants.py b/src/promptflow-devkit/promptflow/_sdk/_constants.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_constants.py rename to src/promptflow-devkit/promptflow/_sdk/_constants.py diff --git a/src/promptflow/promptflow/_sdk/_errors.py b/src/promptflow-devkit/promptflow/_sdk/_errors.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_errors.py rename to src/promptflow-devkit/promptflow/_sdk/_errors.py diff --git a/src/promptflow/promptflow/_sdk/_load_functions.py b/src/promptflow-devkit/promptflow/_sdk/_load_functions.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_load_functions.py rename to src/promptflow-devkit/promptflow/_sdk/_load_functions.py diff --git a/src/promptflow/promptflow/_sdk/_mlflow.py b/src/promptflow-devkit/promptflow/_sdk/_mlflow.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_mlflow.py rename to src/promptflow-devkit/promptflow/_sdk/_mlflow.py diff --git a/src/promptflow/promptflow/_sdk/_orm/__init__.py b/src/promptflow-devkit/promptflow/_sdk/_orm/__init__.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_orm/__init__.py rename to src/promptflow-devkit/promptflow/_sdk/_orm/__init__.py diff --git a/src/promptflow/promptflow/_sdk/_orm/connection.py b/src/promptflow-devkit/promptflow/_sdk/_orm/connection.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_orm/connection.py rename to src/promptflow-devkit/promptflow/_sdk/_orm/connection.py diff --git a/src/promptflow/promptflow/_sdk/_orm/experiment.py b/src/promptflow-devkit/promptflow/_sdk/_orm/experiment.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_orm/experiment.py rename to src/promptflow-devkit/promptflow/_sdk/_orm/experiment.py diff --git a/src/promptflow/promptflow/_sdk/_orm/experiment_node_run.py b/src/promptflow-devkit/promptflow/_sdk/_orm/experiment_node_run.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_orm/experiment_node_run.py rename to src/promptflow-devkit/promptflow/_sdk/_orm/experiment_node_run.py diff --git a/src/promptflow/promptflow/_sdk/_orm/orchestrator.py b/src/promptflow-devkit/promptflow/_sdk/_orm/orchestrator.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_orm/orchestrator.py rename to src/promptflow-devkit/promptflow/_sdk/_orm/orchestrator.py diff --git a/src/promptflow/promptflow/_sdk/_orm/retry.py b/src/promptflow-devkit/promptflow/_sdk/_orm/retry.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_orm/retry.py rename to src/promptflow-devkit/promptflow/_sdk/_orm/retry.py diff --git a/src/promptflow/promptflow/_sdk/_orm/run_info.py b/src/promptflow-devkit/promptflow/_sdk/_orm/run_info.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_orm/run_info.py rename to src/promptflow-devkit/promptflow/_sdk/_orm/run_info.py diff --git a/src/promptflow/promptflow/_sdk/_orm/session.py b/src/promptflow-devkit/promptflow/_sdk/_orm/session.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_orm/session.py rename to src/promptflow-devkit/promptflow/_sdk/_orm/session.py diff --git a/src/promptflow/promptflow/_sdk/_orm/trace.py b/src/promptflow-devkit/promptflow/_sdk/_orm/trace.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_orm/trace.py rename to src/promptflow-devkit/promptflow/_sdk/_orm/trace.py diff --git a/src/promptflow/promptflow/_sdk/_pf_client.py b/src/promptflow-devkit/promptflow/_sdk/_pf_client.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_pf_client.py rename to src/promptflow-devkit/promptflow/_sdk/_pf_client.py diff --git a/src/promptflow/promptflow/_sdk/_run_functions.py b/src/promptflow-devkit/promptflow/_sdk/_run_functions.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_run_functions.py rename to src/promptflow-devkit/promptflow/_sdk/_run_functions.py diff --git a/src/promptflow/promptflow/_sdk/_service/.gitignore b/src/promptflow-devkit/promptflow/_sdk/_service/.gitignore similarity index 100% rename from src/promptflow/promptflow/_sdk/_service/.gitignore rename to src/promptflow-devkit/promptflow/_sdk/_service/.gitignore diff --git a/src/promptflow/promptflow/_sdk/_service/README.md b/src/promptflow-devkit/promptflow/_sdk/_service/README.md similarity index 100% rename from src/promptflow/promptflow/_sdk/_service/README.md rename to src/promptflow-devkit/promptflow/_sdk/_service/README.md diff --git a/src/promptflow/promptflow/_sdk/_service/__init__.py b/src/promptflow-devkit/promptflow/_sdk/_service/__init__.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_service/__init__.py rename to src/promptflow-devkit/promptflow/_sdk/_service/__init__.py diff --git a/src/promptflow/promptflow/_sdk/schemas/__init__.py b/src/promptflow-devkit/promptflow/_sdk/_service/apis/__init__.py similarity index 100% rename from src/promptflow/promptflow/_sdk/schemas/__init__.py rename to src/promptflow-devkit/promptflow/_sdk/_service/apis/__init__.py diff --git a/src/promptflow/promptflow/_sdk/_service/apis/collector.py b/src/promptflow-devkit/promptflow/_sdk/_service/apis/collector.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_service/apis/collector.py rename to src/promptflow-devkit/promptflow/_sdk/_service/apis/collector.py diff --git a/src/promptflow/promptflow/_sdk/_service/apis/connection.py b/src/promptflow-devkit/promptflow/_sdk/_service/apis/connection.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_service/apis/connection.py rename to src/promptflow-devkit/promptflow/_sdk/_service/apis/connection.py diff --git a/src/promptflow/promptflow/_sdk/_service/apis/experiment.py b/src/promptflow-devkit/promptflow/_sdk/_service/apis/experiment.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_service/apis/experiment.py rename to src/promptflow-devkit/promptflow/_sdk/_service/apis/experiment.py diff --git a/src/promptflow/promptflow/_sdk/_service/apis/flow.py b/src/promptflow-devkit/promptflow/_sdk/_service/apis/flow.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_service/apis/flow.py rename to src/promptflow-devkit/promptflow/_sdk/_service/apis/flow.py diff --git a/src/promptflow/promptflow/_sdk/_service/apis/line_run.py b/src/promptflow-devkit/promptflow/_sdk/_service/apis/line_run.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_service/apis/line_run.py rename to src/promptflow-devkit/promptflow/_sdk/_service/apis/line_run.py diff --git a/src/promptflow/promptflow/_sdk/_service/apis/run.py b/src/promptflow-devkit/promptflow/_sdk/_service/apis/run.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_service/apis/run.py rename to src/promptflow-devkit/promptflow/_sdk/_service/apis/run.py diff --git a/src/promptflow/promptflow/_sdk/_service/apis/span.py b/src/promptflow-devkit/promptflow/_sdk/_service/apis/span.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_service/apis/span.py rename to src/promptflow-devkit/promptflow/_sdk/_service/apis/span.py diff --git a/src/promptflow/promptflow/_sdk/_service/apis/telemetry.py b/src/promptflow-devkit/promptflow/_sdk/_service/apis/telemetry.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_service/apis/telemetry.py rename to src/promptflow-devkit/promptflow/_sdk/_service/apis/telemetry.py diff --git a/src/promptflow/promptflow/_sdk/_service/apis/ui.py b/src/promptflow-devkit/promptflow/_sdk/_service/apis/ui.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_service/apis/ui.py rename to src/promptflow-devkit/promptflow/_sdk/_service/apis/ui.py diff --git a/src/promptflow/promptflow/_sdk/_service/app.py b/src/promptflow-devkit/promptflow/_sdk/_service/app.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_service/app.py rename to src/promptflow-devkit/promptflow/_sdk/_service/app.py diff --git a/src/promptflow/promptflow/_sdk/_service/entry.py b/src/promptflow-devkit/promptflow/_sdk/_service/entry.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_service/entry.py rename to src/promptflow-devkit/promptflow/_sdk/_service/entry.py diff --git a/src/promptflow/promptflow/_sdk/_service/generator_configs/csharp.yaml b/src/promptflow-devkit/promptflow/_sdk/_service/generator_configs/csharp.yaml similarity index 100% rename from src/promptflow/promptflow/_sdk/_service/generator_configs/csharp.yaml rename to src/promptflow-devkit/promptflow/_sdk/_service/generator_configs/csharp.yaml diff --git a/src/promptflow/promptflow/_sdk/_service/pfsvc.py b/src/promptflow-devkit/promptflow/_sdk/_service/pfsvc.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_service/pfsvc.py rename to src/promptflow-devkit/promptflow/_sdk/_service/pfsvc.py diff --git a/src/promptflow/promptflow/_sdk/_service/static/assets/favicon.ico b/src/promptflow-devkit/promptflow/_sdk/_service/static/assets/favicon.ico similarity index 100% rename from src/promptflow/promptflow/_sdk/_service/static/assets/favicon.ico rename to src/promptflow-devkit/promptflow/_sdk/_service/static/assets/favicon.ico diff --git a/src/promptflow/promptflow/_sdk/_service/static/assets/index-Rg6Z62xy.js b/src/promptflow-devkit/promptflow/_sdk/_service/static/assets/index-Rg6Z62xy.js similarity index 100% rename from src/promptflow/promptflow/_sdk/_service/static/assets/index-Rg6Z62xy.js rename to src/promptflow-devkit/promptflow/_sdk/_service/static/assets/index-Rg6Z62xy.js diff --git a/src/promptflow/promptflow/_sdk/_service/static/assets/index.mjs b/src/promptflow-devkit/promptflow/_sdk/_service/static/assets/index.mjs similarity index 100% rename from src/promptflow/promptflow/_sdk/_service/static/assets/index.mjs rename to src/promptflow-devkit/promptflow/_sdk/_service/static/assets/index.mjs diff --git a/src/promptflow/promptflow/_sdk/_service/static/assets/style.css b/src/promptflow-devkit/promptflow/_sdk/_service/static/assets/style.css similarity index 100% rename from src/promptflow/promptflow/_sdk/_service/static/assets/style.css rename to src/promptflow-devkit/promptflow/_sdk/_service/static/assets/style.css diff --git a/src/promptflow/promptflow/_sdk/_service/static/chat_index.html b/src/promptflow-devkit/promptflow/_sdk/_service/static/chat_index.html similarity index 98% rename from src/promptflow/promptflow/_sdk/_service/static/chat_index.html rename to src/promptflow-devkit/promptflow/_sdk/_service/static/chat_index.html index 64e0f752ee7..6983a09a1e5 100644 --- a/src/promptflow/promptflow/_sdk/_service/static/chat_index.html +++ b/src/promptflow-devkit/promptflow/_sdk/_service/static/chat_index.html @@ -20,4 +20,4 @@
- \ No newline at end of file + diff --git a/src/promptflow/promptflow/_sdk/_service/static/index.html b/src/promptflow-devkit/promptflow/_sdk/_service/static/index.html similarity index 100% rename from src/promptflow/promptflow/_sdk/_service/static/index.html rename to src/promptflow-devkit/promptflow/_sdk/_service/static/index.html diff --git a/src/promptflow/promptflow/_sdk/_service/swagger.json b/src/promptflow-devkit/promptflow/_sdk/_service/swagger.json similarity index 100% rename from src/promptflow/promptflow/_sdk/_service/swagger.json rename to src/promptflow-devkit/promptflow/_sdk/_service/swagger.json diff --git a/src/promptflow/promptflow/azure/_cli/__init__.py b/src/promptflow-devkit/promptflow/_sdk/_service/utils/__init__.py similarity index 100% rename from src/promptflow/promptflow/azure/_cli/__init__.py rename to src/promptflow-devkit/promptflow/_sdk/_service/utils/__init__.py diff --git a/src/promptflow/promptflow/_sdk/_service/utils/utils.py b/src/promptflow-devkit/promptflow/_sdk/_service/utils/utils.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_service/utils/utils.py rename to src/promptflow-devkit/promptflow/_sdk/_service/utils/utils.py diff --git a/src/promptflow/promptflow/azure/_entities/__init__.py b/src/promptflow-devkit/promptflow/_sdk/_serving/__init__.py similarity index 100% rename from src/promptflow/promptflow/azure/_entities/__init__.py rename to src/promptflow-devkit/promptflow/_sdk/_serving/__init__.py diff --git a/src/promptflow/promptflow/_sdk/_serving/app.py b/src/promptflow-devkit/promptflow/_sdk/_serving/app.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_serving/app.py rename to src/promptflow-devkit/promptflow/_sdk/_serving/app.py diff --git a/src/promptflow/promptflow/_sdk/_submitter/__init__.py b/src/promptflow-devkit/promptflow/_sdk/_submitter/__init__.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_submitter/__init__.py rename to src/promptflow-devkit/promptflow/_sdk/_submitter/__init__.py diff --git a/src/promptflow/promptflow/_sdk/_submitter/experiment_orchestrator.py b/src/promptflow-devkit/promptflow/_sdk/_submitter/experiment_orchestrator.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_submitter/experiment_orchestrator.py rename to src/promptflow-devkit/promptflow/_sdk/_submitter/experiment_orchestrator.py diff --git a/src/promptflow/promptflow/_sdk/_submitter/run_submitter.py b/src/promptflow-devkit/promptflow/_sdk/_submitter/run_submitter.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_submitter/run_submitter.py rename to src/promptflow-devkit/promptflow/_sdk/_submitter/run_submitter.py diff --git a/src/promptflow/promptflow/_sdk/_submitter/test_submitter.py b/src/promptflow-devkit/promptflow/_sdk/_submitter/test_submitter.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_submitter/test_submitter.py rename to src/promptflow-devkit/promptflow/_sdk/_submitter/test_submitter.py diff --git a/src/promptflow/promptflow/_sdk/_submitter/utils.py b/src/promptflow-devkit/promptflow/_sdk/_submitter/utils.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_submitter/utils.py rename to src/promptflow-devkit/promptflow/_sdk/_submitter/utils.py diff --git a/src/promptflow/promptflow/_sdk/_telemetry/__init__.py b/src/promptflow-devkit/promptflow/_sdk/_telemetry/__init__.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_telemetry/__init__.py rename to src/promptflow-devkit/promptflow/_sdk/_telemetry/__init__.py diff --git a/src/promptflow/promptflow/_sdk/_telemetry/activity.py b/src/promptflow-devkit/promptflow/_sdk/_telemetry/activity.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_telemetry/activity.py rename to src/promptflow-devkit/promptflow/_sdk/_telemetry/activity.py diff --git a/src/promptflow/promptflow/_sdk/_telemetry/logging_handler.py b/src/promptflow-devkit/promptflow/_sdk/_telemetry/logging_handler.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_telemetry/logging_handler.py rename to src/promptflow-devkit/promptflow/_sdk/_telemetry/logging_handler.py diff --git a/src/promptflow/promptflow/_sdk/_telemetry/telemetry.py b/src/promptflow-devkit/promptflow/_sdk/_telemetry/telemetry.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_telemetry/telemetry.py rename to src/promptflow-devkit/promptflow/_sdk/_telemetry/telemetry.py diff --git a/src/promptflow/promptflow/_sdk/_tracing.py b/src/promptflow-devkit/promptflow/_sdk/_tracing.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_tracing.py rename to src/promptflow-devkit/promptflow/_sdk/_tracing.py diff --git a/src/promptflow/promptflow/_sdk/_user_agent.py b/src/promptflow-devkit/promptflow/_sdk/_user_agent.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_user_agent.py rename to src/promptflow-devkit/promptflow/_sdk/_user_agent.py diff --git a/src/promptflow/promptflow/_sdk/_utils.py b/src/promptflow-devkit/promptflow/_sdk/_utils.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_utils.py rename to src/promptflow-devkit/promptflow/_sdk/_utils.py diff --git a/src/promptflow/promptflow/_sdk/_vendor/__init__.py b/src/promptflow-devkit/promptflow/_sdk/_vendor/__init__.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_vendor/__init__.py rename to src/promptflow-devkit/promptflow/_sdk/_vendor/__init__.py diff --git a/src/promptflow/promptflow/_sdk/_vendor/_asset_utils.py b/src/promptflow-devkit/promptflow/_sdk/_vendor/_asset_utils.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_vendor/_asset_utils.py rename to src/promptflow-devkit/promptflow/_sdk/_vendor/_asset_utils.py diff --git a/src/promptflow/promptflow/_sdk/_vendor/_pathspec.py b/src/promptflow-devkit/promptflow/_sdk/_vendor/_pathspec.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_vendor/_pathspec.py rename to src/promptflow-devkit/promptflow/_sdk/_vendor/_pathspec.py diff --git a/src/promptflow/promptflow/_sdk/_visualize_functions.py b/src/promptflow-devkit/promptflow/_sdk/_visualize_functions.py similarity index 100% rename from src/promptflow/promptflow/_sdk/_visualize_functions.py rename to src/promptflow-devkit/promptflow/_sdk/_visualize_functions.py diff --git a/src/promptflow/promptflow/_sdk/data/docker/Dockerfile.jinja2 b/src/promptflow-devkit/promptflow/_sdk/data/docker/Dockerfile.jinja2 similarity index 100% rename from src/promptflow/promptflow/_sdk/data/docker/Dockerfile.jinja2 rename to src/promptflow-devkit/promptflow/_sdk/data/docker/Dockerfile.jinja2 diff --git a/src/promptflow/promptflow/_sdk/data/docker/README.md b/src/promptflow-devkit/promptflow/_sdk/data/docker/README.md similarity index 100% rename from src/promptflow/promptflow/_sdk/data/docker/README.md rename to src/promptflow-devkit/promptflow/_sdk/data/docker/README.md diff --git a/src/promptflow/promptflow/_sdk/data/docker/runit/promptflow-serve/finish.jinja2 b/src/promptflow-devkit/promptflow/_sdk/data/docker/runit/promptflow-serve/finish.jinja2 similarity index 84% rename from src/promptflow/promptflow/_sdk/data/docker/runit/promptflow-serve/finish.jinja2 rename to src/promptflow-devkit/promptflow/_sdk/data/docker/runit/promptflow-serve/finish.jinja2 index b0961c27f9d..2724feee4f0 100644 --- a/src/promptflow/promptflow/_sdk/data/docker/runit/promptflow-serve/finish.jinja2 +++ b/src/promptflow-devkit/promptflow/_sdk/data/docker/runit/promptflow-serve/finish.jinja2 @@ -10,4 +10,4 @@ while pgrep gunicorn >/dev/null; do sleep 1 done -echo "$(date -uIns) - Stopped all Gunicorn processes" \ No newline at end of file +echo "$(date -uIns) - Stopped all Gunicorn processes" diff --git a/src/promptflow/promptflow/_sdk/data/docker/runit/promptflow-serve/run.jinja2 b/src/promptflow-devkit/promptflow/_sdk/data/docker/runit/promptflow-serve/run.jinja2 similarity index 100% rename from src/promptflow/promptflow/_sdk/data/docker/runit/promptflow-serve/run.jinja2 rename to src/promptflow-devkit/promptflow/_sdk/data/docker/runit/promptflow-serve/run.jinja2 diff --git a/src/promptflow/promptflow/_sdk/data/docker/start.sh.jinja2 b/src/promptflow-devkit/promptflow/_sdk/data/docker/start.sh.jinja2 similarity index 100% rename from src/promptflow/promptflow/_sdk/data/docker/start.sh.jinja2 rename to src/promptflow-devkit/promptflow/_sdk/data/docker/start.sh.jinja2 diff --git a/src/promptflow/promptflow/_sdk/data/docker_csharp/Dockerfile.jinja2 b/src/promptflow-devkit/promptflow/_sdk/data/docker_csharp/Dockerfile.jinja2 similarity index 100% rename from src/promptflow/promptflow/_sdk/data/docker_csharp/Dockerfile.jinja2 rename to src/promptflow-devkit/promptflow/_sdk/data/docker_csharp/Dockerfile.jinja2 diff --git a/src/promptflow/promptflow/_sdk/data/docker_csharp/README.md b/src/promptflow-devkit/promptflow/_sdk/data/docker_csharp/README.md similarity index 100% rename from src/promptflow/promptflow/_sdk/data/docker_csharp/README.md rename to src/promptflow-devkit/promptflow/_sdk/data/docker_csharp/README.md diff --git a/src/promptflow/promptflow/_sdk/data/docker_csharp/runit/promptflow-serve/finish.jinja2 b/src/promptflow-devkit/promptflow/_sdk/data/docker_csharp/runit/promptflow-serve/finish.jinja2 similarity index 53% rename from src/promptflow/promptflow/_sdk/data/docker_csharp/runit/promptflow-serve/finish.jinja2 rename to src/promptflow-devkit/promptflow/_sdk/data/docker_csharp/runit/promptflow-serve/finish.jinja2 index 893917dbc93..f558ebb2b45 100644 --- a/src/promptflow/promptflow/_sdk/data/docker_csharp/runit/promptflow-serve/finish.jinja2 +++ b/src/promptflow-devkit/promptflow/_sdk/data/docker_csharp/runit/promptflow-serve/finish.jinja2 @@ -1,4 +1,4 @@ #!/bin/bash echo "$(date -uIns) - promptflow-serve/finish $@" -echo "$(date -uIns) - Stopped all Gunicorn processes" \ No newline at end of file +echo "$(date -uIns) - Stopped all Gunicorn processes" diff --git a/src/promptflow/promptflow/_sdk/data/docker_csharp/runit/promptflow-serve/run.jinja2 b/src/promptflow-devkit/promptflow/_sdk/data/docker_csharp/runit/promptflow-serve/run.jinja2 similarity index 87% rename from src/promptflow/promptflow/_sdk/data/docker_csharp/runit/promptflow-serve/run.jinja2 rename to src/promptflow-devkit/promptflow/_sdk/data/docker_csharp/runit/promptflow-serve/run.jinja2 index 6b26d0ac782..4168008ce2f 100644 --- a/src/promptflow/promptflow/_sdk/data/docker_csharp/runit/promptflow-serve/run.jinja2 +++ b/src/promptflow-devkit/promptflow/_sdk/data/docker_csharp/runit/promptflow-serve/run.jinja2 @@ -2,4 +2,4 @@ echo "start promptflow serving" cd /flow -dotnet Promptflow.dll --port "8080" --yaml_path "flow.dag.yaml" --assembly_folder "." --connection_folder_path "../connections" --log_path "" --serving \ No newline at end of file +dotnet Promptflow.dll --port "8080" --yaml_path "flow.dag.yaml" --assembly_folder "." --connection_folder_path "../connections" --log_path "" --serving diff --git a/src/promptflow/promptflow/_sdk/data/docker_csharp/start.sh.jinja2 b/src/promptflow-devkit/promptflow/_sdk/data/docker_csharp/start.sh.jinja2 similarity index 100% rename from src/promptflow/promptflow/_sdk/data/docker_csharp/start.sh.jinja2 rename to src/promptflow-devkit/promptflow/_sdk/data/docker_csharp/start.sh.jinja2 diff --git a/src/promptflow/promptflow/_sdk/data/executable/README.md b/src/promptflow-devkit/promptflow/_sdk/data/executable/README.md similarity index 100% rename from src/promptflow/promptflow/_sdk/data/executable/README.md rename to src/promptflow-devkit/promptflow/_sdk/data/executable/README.md diff --git a/src/promptflow/promptflow/_sdk/data/executable/app.py b/src/promptflow-devkit/promptflow/_sdk/data/executable/app.py similarity index 100% rename from src/promptflow/promptflow/_sdk/data/executable/app.py rename to src/promptflow-devkit/promptflow/_sdk/data/executable/app.py diff --git a/src/promptflow/promptflow/_sdk/data/executable/app.spec.jinja2 b/src/promptflow-devkit/promptflow/_sdk/data/executable/app.spec.jinja2 similarity index 100% rename from src/promptflow/promptflow/_sdk/data/executable/app.spec.jinja2 rename to src/promptflow-devkit/promptflow/_sdk/data/executable/app.spec.jinja2 diff --git a/src/promptflow/promptflow/_sdk/data/executable/logo.png b/src/promptflow-devkit/promptflow/_sdk/data/executable/logo.png similarity index 100% rename from src/promptflow/promptflow/_sdk/data/executable/logo.png rename to src/promptflow-devkit/promptflow/_sdk/data/executable/logo.png diff --git a/src/promptflow/promptflow/_sdk/data/executable/main.py b/src/promptflow-devkit/promptflow/_sdk/data/executable/main.py similarity index 100% rename from src/promptflow/promptflow/_sdk/data/executable/main.py rename to src/promptflow-devkit/promptflow/_sdk/data/executable/main.py diff --git a/src/promptflow/promptflow/_sdk/data/executable/utils.py b/src/promptflow-devkit/promptflow/_sdk/data/executable/utils.py similarity index 100% rename from src/promptflow/promptflow/_sdk/data/executable/utils.py rename to src/promptflow-devkit/promptflow/_sdk/data/executable/utils.py diff --git a/src/promptflow/promptflow/_sdk/data/tool.schema.json b/src/promptflow-devkit/promptflow/_sdk/data/tool.schema.json similarity index 100% rename from src/promptflow/promptflow/_sdk/data/tool.schema.json rename to src/promptflow-devkit/promptflow/_sdk/data/tool.schema.json diff --git a/src/promptflow/promptflow/_sdk/data/visualize.j2 b/src/promptflow-devkit/promptflow/_sdk/data/visualize.j2 similarity index 100% rename from src/promptflow/promptflow/_sdk/data/visualize.j2 rename to src/promptflow-devkit/promptflow/_sdk/data/visualize.j2 diff --git a/src/promptflow/promptflow/_sdk/entities/__init__.py b/src/promptflow-devkit/promptflow/_sdk/entities/__init__.py similarity index 100% rename from src/promptflow/promptflow/_sdk/entities/__init__.py rename to src/promptflow-devkit/promptflow/_sdk/entities/__init__.py diff --git a/src/promptflow/promptflow/_sdk/entities/_chat_group/__init__.py b/src/promptflow-devkit/promptflow/_sdk/entities/_chat_group/__init__.py similarity index 100% rename from src/promptflow/promptflow/_sdk/entities/_chat_group/__init__.py rename to src/promptflow-devkit/promptflow/_sdk/entities/_chat_group/__init__.py diff --git a/src/promptflow/promptflow/_sdk/entities/_chat_group/_chat_group.py b/src/promptflow-devkit/promptflow/_sdk/entities/_chat_group/_chat_group.py similarity index 100% rename from src/promptflow/promptflow/_sdk/entities/_chat_group/_chat_group.py rename to src/promptflow-devkit/promptflow/_sdk/entities/_chat_group/_chat_group.py diff --git a/src/promptflow/promptflow/_sdk/entities/_chat_group/_chat_group_io.py b/src/promptflow-devkit/promptflow/_sdk/entities/_chat_group/_chat_group_io.py similarity index 100% rename from src/promptflow/promptflow/_sdk/entities/_chat_group/_chat_group_io.py rename to src/promptflow-devkit/promptflow/_sdk/entities/_chat_group/_chat_group_io.py diff --git a/src/promptflow/promptflow/_sdk/entities/_chat_group/_chat_role.py b/src/promptflow-devkit/promptflow/_sdk/entities/_chat_group/_chat_role.py similarity index 100% rename from src/promptflow/promptflow/_sdk/entities/_chat_group/_chat_role.py rename to src/promptflow-devkit/promptflow/_sdk/entities/_chat_group/_chat_role.py diff --git a/src/promptflow/promptflow/_sdk/entities/_connection.py b/src/promptflow-devkit/promptflow/_sdk/entities/_connection.py similarity index 100% rename from src/promptflow/promptflow/_sdk/entities/_connection.py rename to src/promptflow-devkit/promptflow/_sdk/entities/_connection.py diff --git a/src/promptflow/promptflow/_sdk/entities/_experiment.py b/src/promptflow-devkit/promptflow/_sdk/entities/_experiment.py similarity index 100% rename from src/promptflow/promptflow/_sdk/entities/_experiment.py rename to src/promptflow-devkit/promptflow/_sdk/entities/_experiment.py diff --git a/src/promptflow/promptflow/_sdk/entities/_flow/__init__.py b/src/promptflow-devkit/promptflow/_sdk/entities/_flow/__init__.py similarity index 100% rename from src/promptflow/promptflow/_sdk/entities/_flow/__init__.py rename to src/promptflow-devkit/promptflow/_sdk/entities/_flow/__init__.py diff --git a/src/promptflow/promptflow/_sdk/entities/_flow/_flow_context_resolver.py b/src/promptflow-devkit/promptflow/_sdk/entities/_flow/_flow_context_resolver.py similarity index 100% rename from src/promptflow/promptflow/_sdk/entities/_flow/_flow_context_resolver.py rename to src/promptflow-devkit/promptflow/_sdk/entities/_flow/_flow_context_resolver.py diff --git a/src/promptflow/promptflow/_sdk/entities/_flow/base.py b/src/promptflow-devkit/promptflow/_sdk/entities/_flow/base.py similarity index 100% rename from src/promptflow/promptflow/_sdk/entities/_flow/base.py rename to src/promptflow-devkit/promptflow/_sdk/entities/_flow/base.py diff --git a/src/promptflow/promptflow/_sdk/entities/_flow/dag.py b/src/promptflow-devkit/promptflow/_sdk/entities/_flow/dag.py similarity index 100% rename from src/promptflow/promptflow/_sdk/entities/_flow/dag.py rename to src/promptflow-devkit/promptflow/_sdk/entities/_flow/dag.py diff --git a/src/promptflow/promptflow/_sdk/entities/_flow/flex.py b/src/promptflow-devkit/promptflow/_sdk/entities/_flow/flex.py similarity index 100% rename from src/promptflow/promptflow/_sdk/entities/_flow/flex.py rename to src/promptflow-devkit/promptflow/_sdk/entities/_flow/flex.py diff --git a/src/promptflow/promptflow/_sdk/entities/_run.py b/src/promptflow-devkit/promptflow/_sdk/entities/_run.py similarity index 100% rename from src/promptflow/promptflow/_sdk/entities/_run.py rename to src/promptflow-devkit/promptflow/_sdk/entities/_run.py diff --git a/src/promptflow/promptflow/_sdk/entities/_run_inputs.py b/src/promptflow-devkit/promptflow/_sdk/entities/_run_inputs.py similarity index 100% rename from src/promptflow/promptflow/_sdk/entities/_run_inputs.py rename to src/promptflow-devkit/promptflow/_sdk/entities/_run_inputs.py diff --git a/src/promptflow/promptflow/_sdk/entities/_trace.py b/src/promptflow-devkit/promptflow/_sdk/entities/_trace.py similarity index 100% rename from src/promptflow/promptflow/_sdk/entities/_trace.py rename to src/promptflow-devkit/promptflow/_sdk/entities/_trace.py diff --git a/src/promptflow/promptflow/_sdk/entities/_validation/__init__.py b/src/promptflow-devkit/promptflow/_sdk/entities/_validation/__init__.py similarity index 100% rename from src/promptflow/promptflow/_sdk/entities/_validation/__init__.py rename to src/promptflow-devkit/promptflow/_sdk/entities/_validation/__init__.py diff --git a/src/promptflow/promptflow/_sdk/entities/_validation/core.py b/src/promptflow-devkit/promptflow/_sdk/entities/_validation/core.py similarity index 100% rename from src/promptflow/promptflow/_sdk/entities/_validation/core.py rename to src/promptflow-devkit/promptflow/_sdk/entities/_validation/core.py diff --git a/src/promptflow/promptflow/_sdk/entities/_validation/schema.py b/src/promptflow-devkit/promptflow/_sdk/entities/_validation/schema.py similarity index 100% rename from src/promptflow/promptflow/_sdk/entities/_validation/schema.py rename to src/promptflow-devkit/promptflow/_sdk/entities/_validation/schema.py diff --git a/src/promptflow/promptflow/_sdk/entities/_yaml_translatable.py b/src/promptflow-devkit/promptflow/_sdk/entities/_yaml_translatable.py similarity index 100% rename from src/promptflow/promptflow/_sdk/entities/_yaml_translatable.py rename to src/promptflow-devkit/promptflow/_sdk/entities/_yaml_translatable.py diff --git a/src/promptflow/promptflow/_sdk/operations/__init__.py b/src/promptflow-devkit/promptflow/_sdk/operations/__init__.py similarity index 100% rename from src/promptflow/promptflow/_sdk/operations/__init__.py rename to src/promptflow-devkit/promptflow/_sdk/operations/__init__.py diff --git a/src/promptflow/promptflow/_sdk/operations/_connection_operations.py b/src/promptflow-devkit/promptflow/_sdk/operations/_connection_operations.py similarity index 100% rename from src/promptflow/promptflow/_sdk/operations/_connection_operations.py rename to src/promptflow-devkit/promptflow/_sdk/operations/_connection_operations.py diff --git a/src/promptflow/promptflow/_sdk/operations/_experiment_operations.py b/src/promptflow-devkit/promptflow/_sdk/operations/_experiment_operations.py similarity index 100% rename from src/promptflow/promptflow/_sdk/operations/_experiment_operations.py rename to src/promptflow-devkit/promptflow/_sdk/operations/_experiment_operations.py diff --git a/src/promptflow/promptflow/_sdk/operations/_flow_operations.py b/src/promptflow-devkit/promptflow/_sdk/operations/_flow_operations.py similarity index 100% rename from src/promptflow/promptflow/_sdk/operations/_flow_operations.py rename to src/promptflow-devkit/promptflow/_sdk/operations/_flow_operations.py diff --git a/src/promptflow/promptflow/_sdk/operations/_local_azure_connection_operations.py b/src/promptflow-devkit/promptflow/_sdk/operations/_local_azure_connection_operations.py similarity index 100% rename from src/promptflow/promptflow/_sdk/operations/_local_azure_connection_operations.py rename to src/promptflow-devkit/promptflow/_sdk/operations/_local_azure_connection_operations.py diff --git a/src/promptflow/promptflow/_sdk/operations/_local_storage_operations.py b/src/promptflow-devkit/promptflow/_sdk/operations/_local_storage_operations.py similarity index 100% rename from src/promptflow/promptflow/_sdk/operations/_local_storage_operations.py rename to src/promptflow-devkit/promptflow/_sdk/operations/_local_storage_operations.py diff --git a/src/promptflow/promptflow/_sdk/operations/_run_operations.py b/src/promptflow-devkit/promptflow/_sdk/operations/_run_operations.py similarity index 100% rename from src/promptflow/promptflow/_sdk/operations/_run_operations.py rename to src/promptflow-devkit/promptflow/_sdk/operations/_run_operations.py diff --git a/src/promptflow/promptflow/_sdk/operations/_tool_operations.py b/src/promptflow-devkit/promptflow/_sdk/operations/_tool_operations.py similarity index 100% rename from src/promptflow/promptflow/_sdk/operations/_tool_operations.py rename to src/promptflow-devkit/promptflow/_sdk/operations/_tool_operations.py diff --git a/src/promptflow/promptflow/_sdk/operations/_trace_operations.py b/src/promptflow-devkit/promptflow/_sdk/operations/_trace_operations.py similarity index 100% rename from src/promptflow/promptflow/_sdk/operations/_trace_operations.py rename to src/promptflow-devkit/promptflow/_sdk/operations/_trace_operations.py diff --git a/src/promptflow/promptflow/azure/_schemas/__init__.py b/src/promptflow-devkit/promptflow/_sdk/schemas/__init__.py similarity index 100% rename from src/promptflow/promptflow/azure/_schemas/__init__.py rename to src/promptflow-devkit/promptflow/_sdk/schemas/__init__.py diff --git a/src/promptflow/promptflow/_sdk/schemas/_base.py b/src/promptflow-devkit/promptflow/_sdk/schemas/_base.py similarity index 100% rename from src/promptflow/promptflow/_sdk/schemas/_base.py rename to src/promptflow-devkit/promptflow/_sdk/schemas/_base.py diff --git a/src/promptflow/promptflow/_sdk/schemas/_connection.py b/src/promptflow-devkit/promptflow/_sdk/schemas/_connection.py similarity index 100% rename from src/promptflow/promptflow/_sdk/schemas/_connection.py rename to src/promptflow-devkit/promptflow/_sdk/schemas/_connection.py diff --git a/src/promptflow/promptflow/_sdk/schemas/_experiment.py b/src/promptflow-devkit/promptflow/_sdk/schemas/_experiment.py similarity index 100% rename from src/promptflow/promptflow/_sdk/schemas/_experiment.py rename to src/promptflow-devkit/promptflow/_sdk/schemas/_experiment.py diff --git a/src/promptflow/promptflow/_sdk/schemas/_fields.py b/src/promptflow-devkit/promptflow/_sdk/schemas/_fields.py similarity index 100% rename from src/promptflow/promptflow/_sdk/schemas/_fields.py rename to src/promptflow-devkit/promptflow/_sdk/schemas/_fields.py diff --git a/src/promptflow/promptflow/_sdk/schemas/_flow.py b/src/promptflow-devkit/promptflow/_sdk/schemas/_flow.py similarity index 100% rename from src/promptflow/promptflow/_sdk/schemas/_flow.py rename to src/promptflow-devkit/promptflow/_sdk/schemas/_flow.py diff --git a/src/promptflow/promptflow/_sdk/schemas/_run.py b/src/promptflow-devkit/promptflow/_sdk/schemas/_run.py similarity index 100% rename from src/promptflow/promptflow/_sdk/schemas/_run.py rename to src/promptflow-devkit/promptflow/_sdk/schemas/_run.py diff --git a/src/promptflow-devkit/promptflow/devkit/__init__.py b/src/promptflow-devkit/promptflow/_version.py similarity index 74% rename from src/promptflow-devkit/promptflow/devkit/__init__.py rename to src/promptflow-devkit/promptflow/_version.py index 555fb331eb2..68ee238ac5d 100644 --- a/src/promptflow-devkit/promptflow/devkit/__init__.py +++ b/src/promptflow-devkit/promptflow/_version.py @@ -2,6 +2,4 @@ # Copyright (c) Microsoft Corporation. All rights reserved. # --------------------------------------------------------- -from ._version import __version__ - -__all__ = ["__version__"] +VERSION = "0.0.1" diff --git a/src/promptflow/promptflow/batch/__init__.py b/src/promptflow-devkit/promptflow/batch/__init__.py similarity index 100% rename from src/promptflow/promptflow/batch/__init__.py rename to src/promptflow-devkit/promptflow/batch/__init__.py diff --git a/src/promptflow/promptflow/batch/_base_executor_proxy.py b/src/promptflow-devkit/promptflow/batch/_base_executor_proxy.py similarity index 100% rename from src/promptflow/promptflow/batch/_base_executor_proxy.py rename to src/promptflow-devkit/promptflow/batch/_base_executor_proxy.py diff --git a/src/promptflow/promptflow/batch/_batch_engine.py b/src/promptflow-devkit/promptflow/batch/_batch_engine.py similarity index 100% rename from src/promptflow/promptflow/batch/_batch_engine.py rename to src/promptflow-devkit/promptflow/batch/_batch_engine.py diff --git a/src/promptflow/promptflow/batch/_batch_inputs_processor.py b/src/promptflow-devkit/promptflow/batch/_batch_inputs_processor.py similarity index 100% rename from src/promptflow/promptflow/batch/_batch_inputs_processor.py rename to src/promptflow-devkit/promptflow/batch/_batch_inputs_processor.py diff --git a/src/promptflow/promptflow/batch/_csharp_base_executor_proxy.py b/src/promptflow-devkit/promptflow/batch/_csharp_base_executor_proxy.py similarity index 100% rename from src/promptflow/promptflow/batch/_csharp_base_executor_proxy.py rename to src/promptflow-devkit/promptflow/batch/_csharp_base_executor_proxy.py diff --git a/src/promptflow/promptflow/batch/_csharp_executor_proxy.py b/src/promptflow-devkit/promptflow/batch/_csharp_executor_proxy.py similarity index 100% rename from src/promptflow/promptflow/batch/_csharp_executor_proxy.py rename to src/promptflow-devkit/promptflow/batch/_csharp_executor_proxy.py diff --git a/src/promptflow/promptflow/batch/_errors.py b/src/promptflow-devkit/promptflow/batch/_errors.py similarity index 100% rename from src/promptflow/promptflow/batch/_errors.py rename to src/promptflow-devkit/promptflow/batch/_errors.py diff --git a/src/promptflow/promptflow/batch/_python_executor_proxy.py b/src/promptflow-devkit/promptflow/batch/_python_executor_proxy.py similarity index 100% rename from src/promptflow/promptflow/batch/_python_executor_proxy.py rename to src/promptflow-devkit/promptflow/batch/_python_executor_proxy.py diff --git a/src/promptflow/promptflow/batch/_result.py b/src/promptflow-devkit/promptflow/batch/_result.py similarity index 100% rename from src/promptflow/promptflow/batch/_result.py rename to src/promptflow-devkit/promptflow/batch/_result.py diff --git a/src/promptflow/promptflow/client/__init__.py b/src/promptflow-devkit/promptflow/client/__init__.py similarity index 100% rename from src/promptflow/promptflow/client/__init__.py rename to src/promptflow-devkit/promptflow/client/__init__.py diff --git a/src/promptflow-devkit/promptflow/devkit/_version.py b/src/promptflow-devkit/promptflow/devkit/_version.py deleted file mode 100644 index e59d8f07748..00000000000 --- a/src/promptflow-devkit/promptflow/devkit/_version.py +++ /dev/null @@ -1,7 +0,0 @@ -# --------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# --------------------------------------------------------- - -import importlib.metadata - -__version__ = importlib.metadata.version("promptflow-devkit") diff --git a/src/promptflow/promptflow/entities/__init__.py b/src/promptflow-devkit/promptflow/entities/__init__.py similarity index 100% rename from src/promptflow/promptflow/entities/__init__.py rename to src/promptflow-devkit/promptflow/entities/__init__.py diff --git a/src/promptflow/promptflow/operations/__init__.py b/src/promptflow-devkit/promptflow/operations/__init__.py similarity index 100% rename from src/promptflow/promptflow/operations/__init__.py rename to src/promptflow-devkit/promptflow/operations/__init__.py diff --git a/src/promptflow-devkit/pyproject.toml b/src/promptflow-devkit/pyproject.toml index 2f59b331fcb..e5662b0406b 100644 --- a/src/promptflow-devkit/pyproject.toml +++ b/src/promptflow-devkit/pyproject.toml @@ -2,6 +2,12 @@ name = "promptflow-devkit" version = "0.1.0b1" description = "Prompt flow devkit" +include = [ + "promptflow/_sdk/_service/static/*", + "promptflow/_sdk/_service/static/assets/*", + "promptflow/_cli/data/**/*", + "promptflow/_sdk/data/**/*", +] license = "MIT" @@ -36,20 +42,76 @@ packages = [ [tool.poetry.dependencies] python = "<4.0,>=3.8" +promptflow-core = "<2.0.0" +psutil = "*" # get process information when bulk run +httpx = ">=0.25.1" # used to send http requests asynchronously +sqlalchemy = ">=1.4.48,<3.0.0" # sqlite requirements +pandas = ">=1.5.3,<3.0.0" # load data requirements +python-dotenv = ">=1.0.0,<2.0.0" # control plane sdk requirements, to load .env file +keyring = ">=24.2.0,<25.0.0" # control plane sdk requirements, to access system keyring service +pydash = ">=6.0.0,<8.0.0" # control plane sdk requirements, to support parameter overrides in schema. +cryptography = ">=42.0.4" # control plane sdk requirements to support connection encryption +colorama = ">=0.4.6,<0.5.0" # producing colored terminal text for testing chat flow +tabulate = ">=0.9.0,<1.0.0" # control plane sdk requirements, to print table in console +filelock = ">=3.4.0,<4.0.0" # control plane sdk requirements, to lock for multiprocessing +marshmallow = ">=3.5,<4.0.0" +gitpython = ">=3.1.24,<4.0.0" # used git info to generate flow id +strictyaml = ">=1.5.0,<2.0.0" # used to identify exact location of validation error +waitress = ">=2.1.2,<3.0.0" # used to serve local service +azure-monitor-opentelemetry-exporter = ">=1.0.0b21,<2.0.0" +pyarrow = ">=14.0.1,<15.0.0" # used to read parquet file with pandas.read_parquet +pillow = ">=10.1.0,<11.0.0" # used to generate icon data URI for package tool +opentelemetry-exporter-otlp-proto-http = ">=1.22.0,<2.0.0" # trace support +flask-restx = ">=1.2.0,<2.0.0" # PFS Swagger +flask-cors = ">=4.0.0,<5.0.0" # handle PFS CORS +pyinstaller = ">=5.13.2" +streamlit = ">=1.26.0" +streamlit-quill = "<0.1.0" +bs4 = "*" + +[tool.poetry.extras] +all = [ + "pyarrow", + "pyinstaller", + "streamlit", + "streamlit-quill", + "bs4", +] +executable = [ + "pyarrow", + "pyinstaller", + "streamlit", + "streamlit-quill", + "bs4", +] +pyarrow = [ + "pyarrow", +] [tool.poetry.group.dev.dependencies] pre-commit = "*" import-linter = "*" +promptflow-core = { path = "../promptflow-core" } [tool.poetry.group.test.dependencies] pytest = "*" pytest-cov = "*" pytest-xdist = "*" +pytest-mock = "*" +pytest-asyncio = "*" +mock = "*" +ipykernel = ">=6.27.1" +papermill = ">=2.5.0" +keyrings-alt = "*" [build-system] requires = ["poetry-core>=1.5.0"] build-backend = "poetry.core.masonry.api" +[tool.poetry.scripts] +pf = "promptflow._cli._pf.entry:main" +pfs = "promptflow._sdk._service.entry:main" + [tool.pytest.ini_options] markers = [ "unittest", @@ -58,11 +120,6 @@ markers = [ # durations - list the slowest test durations addopts = """ --junit-xml=test-results.xml \ ---cov=promptflow \ ---cov-config=pyproject.toml \ ---cov-report=term \ ---cov-report=html \ ---cov-report=xml \ --dist loadfile \ --log-level=info \ --log-format="%(asctime)s %(levelname)s %(message)s" \ diff --git a/src/promptflow-recording/pyproject.toml b/src/promptflow-recording/pyproject.toml index 7a468a35813..69836ddbf40 100644 --- a/src/promptflow-recording/pyproject.toml +++ b/src/promptflow-recording/pyproject.toml @@ -37,6 +37,7 @@ packages = [ [tool.poetry.dependencies] python = "<4.0,>=3.8" vcrpy = ">=5.1" +promptflow-tracing = ">=0.1.0b1, <2.0.0" [tool.poetry.group.dev.dependencies] pre-commit = "*" diff --git a/src/promptflow/MANIFEST.in b/src/promptflow/MANIFEST.in index bdbbd599f89..e69de29bb2d 100644 --- a/src/promptflow/MANIFEST.in +++ b/src/promptflow/MANIFEST.in @@ -1,5 +0,0 @@ -include promptflow/azure/resources/* -include promptflow/_sdk/_service/static/* -include promptflow/_sdk/_service/static/assets/* -recursive-include promptflow/_cli/data * -recursive-include promptflow/_sdk/data * diff --git a/src/promptflow/pf b/src/promptflow/pf deleted file mode 100644 index 0447b972c1d..00000000000 --- a/src/promptflow/pf +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env python - -import sys -import os - -if os.environ.get('PF_INSTALLER') is None: - os.environ['PF_INSTALLER'] = 'PIP' - -os.execl(sys.executable, sys.executable, '-m', 'promptflow._cli._pf.entry', *sys.argv[1:]) diff --git a/src/promptflow/promptflow/_cli/data/entry_flow/requirements_txt b/src/promptflow/promptflow/_cli/data/entry_flow/requirements_txt deleted file mode 100644 index 2201c932fb3..00000000000 --- a/src/promptflow/promptflow/_cli/data/entry_flow/requirements_txt +++ /dev/null @@ -1 +0,0 @@ -promptflow \ No newline at end of file diff --git a/src/promptflow/promptflow/azure/__init__.py b/src/promptflow/promptflow/azure/__init__.py deleted file mode 100644 index fcf0ebcdceb..00000000000 --- a/src/promptflow/promptflow/azure/__init__.py +++ /dev/null @@ -1,9 +0,0 @@ -# --------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# --------------------------------------------------------- - -__path__ = __import__("pkgutil").extend_path(__path__, __name__) # type: ignore - -from ._pf_client import PFClient - -__all__ = ["PFClient"] diff --git a/src/promptflow/setup.py b/src/promptflow/setup.py index 3261e437898..8ea5a0eaf4f 100644 --- a/src/promptflow/setup.py +++ b/src/promptflow/setup.py @@ -21,33 +21,9 @@ changelog = f.read() REQUIRES = [ - "psutil", # get process information when bulk run - "httpx>=0.25.1", # used to send http requests asynchronously - "sqlalchemy>=1.4.48,<3.0.0", # sqlite requirements - # note that pandas 1.5.3 is the only version to test in ci before promptflow 0.1.0b7 is released - # and pandas 2.x.x will be the only version to test in ci after that. - "pandas>=1.5.3,<3.0.0", # load data requirements - "python-dotenv>=1.0.0,<2.0.0", # control plane sdk requirements, to load .env file - "keyring>=24.2.0,<25.0.0", # control plane sdk requirements, to access system keyring service - "pydash>=6.0.0,<8.0.0", # control plane sdk requirements, to support parameter overrides in schema. - # vulnerability: https://github.com/advisories/GHSA-5cpq-8wj7-hf2v - "cryptography>=42.0.4", # control plane sdk requirements to support connection encryption - "colorama>=0.4.6,<0.5.0", # producing colored terminal text for testing chat flow - "tabulate>=0.9.0,<1.0.0", # control plane sdk requirements, to print table in console - "filelock>=3.4.0,<4.0.0", # control plane sdk requirements, to lock for multiprocessing - # We need to pin the version due to the issue: https://github.com/hwchase17/langchain/issues/5113 - "marshmallow>=3.5,<4.0.0", - "gitpython>=3.1.24,<4.0.0", # used git info to generate flow id - "strictyaml>=1.5.0,<2.0.0", # used to identify exact location of validation error - "waitress>=2.1.2,<3.0.0", # used to serve local service - "azure-monitor-opentelemetry-exporter>=1.0.0b21,<2.0.0", - "pyarrow>=14.0.1,<15.0.0", # used to read parquet file with pandas.read_parquet - "pillow>=10.1.0,<11.0.0", # used to generate icon data URI for package tool - "opentelemetry-exporter-otlp-proto-http>=1.22.0,<2.0.0", # trace support - "flask-restx>=1.2.0,<2.0.0", # PFS Swagger - "flask-cors>=4.0.0,<5.0.0", # handle PFS CORS "promptflow-tracing>=1.0.0", # tracing capabilities - "promptflow-core", + "promptflow-core", # core capabilities + "promptflow-devkit", # devkit capabilities ] setup( @@ -74,15 +50,13 @@ python_requires="<4.0,>=3.8", install_requires=REQUIRES, extras_require={ - "azure": [ - "azure-core>=1.26.4,<2.0.0", - "azure-storage-blob[aio]>=12.17.0,<13.0.0", # add [aio] for async run download feature - "azure-identity>=1.12.0,<2.0.0", - "azure-ai-ml>=1.14.0,<2.0.0", - "pyjwt>=2.4.0,<3.0.0", # requirement of control plane SDK - "azure-cosmos>=4.5.1,<5.0.0", # used to upload trace to cloud + "all": [ + "promptflow-core[executor-service]", + "promptflow-devkit[all]", + "promptflow-azure", ], - "executable": ["pyinstaller>=5.13.2", "streamlit>=1.26.0", "streamlit-quill<0.1.0", "bs4"], + "azure": ["promptflow-azure"], + "executable": ["promptflow-devkit[executable]"], "azureml-serving": [ # AzureML connection dependencies "azure-identity>=1.12.0,<2.0.0", @@ -91,17 +65,11 @@ "azureml-ai-monitoring>=0.1.0b3,<1.0.0", ], "executor-service": [ - "fastapi>=0.109.0,<1.0.0", # used to build web executor server + "promptflow-core[executor-service]", # used to build web executor server ], }, packages=find_packages(), - scripts=["pf", "pf.bat"], - entry_points={ - "console_scripts": [ - "pfazure = promptflow.azure._cli.entry:main", - "pfs = promptflow._sdk._service.entry:main", - ], - }, + scripts=["pf.bat"], include_package_data=True, project_urls={ "Bug Reports": "https://github.com/microsoft/promptflow/issues",