From 7260bab7c2ada6a1ed51ff4ee89622fc51a66d8e Mon Sep 17 00:00:00 2001
From: Brynn Yin <24237253+brynn-code@users.noreply.github.com>
Date: Wed, 17 Jul 2024 15:09:38 +0800
Subject: [PATCH] [devkit] Add promptflow package to dockerfile (#3556)

# Description

Please add an informative description that covers that changes made by
the pull request and link all relevant issues.

# 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).**
- [ ] **I confirm that all new dependencies are compatible with the MIT
license.**
- [ ] **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.

---------

Signed-off-by: Brynn Yin <biyi@microsoft.com>
---
 src/promptflow-devkit/CHANGELOG.md                             | 3 ++-
 .../promptflow/_sdk/data/docker/Dockerfile.jinja2              | 1 +
 src/promptflow/CHANGELOG.md                                    | 3 ++-
 .../tests/test_configs/flows/export/flex_flow_build/Dockerfile | 1 +
 .../tests/test_configs/flows/export/linux/Dockerfile           | 1 +
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/promptflow-devkit/CHANGELOG.md b/src/promptflow-devkit/CHANGELOG.md
index ccd05c50964..81b7e7e9888 100644
--- a/src/promptflow-devkit/CHANGELOG.md
+++ b/src/promptflow-devkit/CHANGELOG.md
@@ -1,7 +1,8 @@
 # promptflow-devkit package
 
 ## v1.14.0 (Upcoming)
-TODO
+### Improvements
+- Add `promptflow` to dockerfile when build flow with `python_requirements_txt` incase promptflow not exists in custom requirements.
 
 ## v1.13.0 (2024.06.28)
 
diff --git a/src/promptflow-devkit/promptflow/_sdk/data/docker/Dockerfile.jinja2 b/src/promptflow-devkit/promptflow/_sdk/data/docker/Dockerfile.jinja2
index 7e6b25c6189..b4bd747db85 100644
--- a/src/promptflow-devkit/promptflow/_sdk/data/docker/Dockerfile.jinja2
+++ b/src/promptflow-devkit/promptflow/_sdk/data/docker/Dockerfile.jinja2
@@ -28,6 +28,7 @@ RUN conda create -n {{env.conda_env_name}} python=3.9.16 pip=23.0.1 -q -y && \
     conda run -n {{env.conda_env_name}} \
 {% if env.python_requirements_txt %}
     pip install -r /flow/{{env.python_requirements_txt}} && \
+    conda run -n {{env.conda_env_name}} pip install promptflow && \
 {% else %}
 {% if env.sdk_version %}
     pip install promptflow=={{env.sdk_version}} \
diff --git a/src/promptflow/CHANGELOG.md b/src/promptflow/CHANGELOG.md
index e814429b2ac..d624c28dae7 100644
--- a/src/promptflow/CHANGELOG.md
+++ b/src/promptflow/CHANGELOG.md
@@ -1,7 +1,8 @@
 # Release History
 
 ## v1.14.0 (Upcoming)
-TODO
+### Improvements
+- [promptflow-devkit] Add `promptflow` to dockerfile when build flow with `python_requirements_txt` incase promptflow not exists in custom requirements.
 
 ## v1.13.0 (2024.06.28)
 
diff --git a/src/promptflow/tests/test_configs/flows/export/flex_flow_build/Dockerfile b/src/promptflow/tests/test_configs/flows/export/flex_flow_build/Dockerfile
index 47cf3570de1..5cb9b85df42 100644
--- a/src/promptflow/tests/test_configs/flows/export/flex_flow_build/Dockerfile
+++ b/src/promptflow/tests/test_configs/flows/export/flex_flow_build/Dockerfile
@@ -12,6 +12,7 @@ RUN apt-get update && apt-get install -y runit gcc
 RUN conda create -n promptflow-serve python=3.9.16 pip=23.0.1 -q -y && \
     conda run -n promptflow-serve \
     pip install -r /flow/requirements.txt && \
+    conda run -n promptflow-serve pip install promptflow && \
     conda run -n promptflow-serve pip install keyrings.alt && \
     conda run -n promptflow-serve pip install gunicorn==20.1.0 && \
     conda run -n promptflow-serve pip install 'uvicorn>=0.27.0,<1.0.0' && \
diff --git a/src/promptflow/tests/test_configs/flows/export/linux/Dockerfile b/src/promptflow/tests/test_configs/flows/export/linux/Dockerfile
index cf7c9c6786c..85df18523a1 100644
--- a/src/promptflow/tests/test_configs/flows/export/linux/Dockerfile
+++ b/src/promptflow/tests/test_configs/flows/export/linux/Dockerfile
@@ -12,6 +12,7 @@ RUN apt-get update && apt-get install -y runit gcc
 RUN conda create -n promptflow-serve python=3.9.16 pip=23.0.1 -q -y && \
     conda run -n promptflow-serve \
     pip install -r /flow/requirements_txt && \
+    conda run -n promptflow-serve pip install promptflow && \
     conda run -n promptflow-serve pip install keyrings.alt && \
     conda run -n promptflow-serve pip install gunicorn==20.1.0 && \
     conda run -n promptflow-serve pip install 'uvicorn>=0.27.0,<1.0.0' && \