Revert "Merge branch 'main' into release/promptflow/1.15.0.post1"

This reverts commit b8e56c6, reversing
changes made to 18d49d1.

.cspell.json

@@ -54,67 +54,65 @@
     "benchmark/promptflow-serve/result-archive/**"
   ],
   "words": [
-    "amlignore",
     "aoai",
-    "Apim",
-    "astext",
-    "attribited",
-    "azureai",
-    "azurecr",
+    "amlignore",
+    "mldesigner",
+    "faiss",
+    "serp",
     "azureml",
-    "azuremlsdktestpypi",
-    "Bhavik",
-    "centralus",
-    "chatml",
-    "cref",
-    "e2etest",
-    "e2etests",
+    "mlflow",
+    "vnet",
+    "openai",
+    "pfazure",
     "eastus",
-    "Entra",
+    "azureai",
+    "vectordb",
+    "Qdrant",
+    "Weaviate",
     "env",
-    "faiss",
-    "geval",
+    "e2etests",
+    "e2etest",
+    "tablefmt",
+    "logprobs",
+    "logit",
     "hnsw",
-    "junit",
+    "chatml",
+    "UNLCK",
     "KHTML",
-    "Likert",
-    "llmlingua",
-    "logit",
-    "logprobs",
-    "meid",
-    "mgmt",
-    "MistralAI",
-    "mldesigner",
-    "mlflow",
-    "msal",
-    "msrest",
-    "myconn",
     "numlines",
-    "nunit",
-    "openai",
-    "pfazure",
-    "pfbytes",
-    "pfcli",
-    "pfutil",
+    "azurecr",
+    "centralus",
     "Policheck",
-    "pydata",
-    "Qdrant",
+    "azuremlsdktestpypi",
     "rediraffe",
-    "retriable",
+    "pydata",
     "ROBOCOPY",
-    "serp",
-    "Summ",
-    "tablefmt",
     "undoc",
-    "UNLCK",
-    "upia",
-    "uvicorn",
-    "vectordb",
-    "vnet",
-    "Weaviate",
-    "westus",
+    "retriable",
+    "pfcli",
+    "pfutil",
+    "mgmt",
     "wsid",
-    "Xpia"
+    "westus",
+    "msrest",
+    "cref",
+    "msal",
+    "pfbytes",
+    "Apim",
+    "junit",
+    "nunit",
+    "astext",
+    "Likert",
+    "geval",
+    "Summ",
+    "Bhavik",
+    "meid",
+    "Entra",
+    "uvicorn",
+    "attribited",
+    "MistralAI",
+    "llmlingua",
+    "myconn"
   ],
   "ignoreWords": [
     "openmpi",
@@ -244,20 +242,10 @@
     "azureopenaimodelconfiguration",
     "openaimodelconfiguration",
     "usecwd",
-    "upia",
-    "xpia",
     "locustio",
     "euap",
-    "Rerank",
-    "rerank",
-    "reranker",
     "rcfile",
-    "pylintrc",
-    "gleu",
-    "Gleu",
-    "GLEU",
-    "fmeasure",
-    "punkt"
+    "pylintrc"
   ],
   "flagWords": [
     "Prompt Flow"

docs/cloud/index.md

@@ -27,6 +27,12 @@ In prompt flow, You can develop your flow locally and then seamlessly transition
 
 For more resources on Azure AI, visit the cloud documentation site: [Build AI solutions with prompt flow](https://learn.microsoft.com/en-us/azure/machine-learning/prompt-flow/get-started-prompt-flow?view=azureml-api-2).
 
+```{toctree}
+:caption: Tracing
+:maxdepth: 2
+azureai/tracing/index
+```
+
 ```{toctree}
 :caption: Flow
 :maxdepth: 2

docs/concepts/concept-connections.md

@@ -11,11 +11,11 @@ Prompt flow provides a variety of pre-built connections, including Azure OpenAI,
 
 | Connection type                                              | Built-in tools                  |
 | ------------------------------------------------------------ | ------------------------------- |
-| [Azure OpenAI](https://azure.microsoft.com/products/cognitive-services/openai-service) | LLM or Python                   |
+| [Azure OpenAI](https://azure.microsoft.com/en-us/products/cognitive-services/openai-service) | LLM or Python                   |
 | [OpenAI](https://openai.com/)                               | LLM or Python                   |
-| [Cognitive Search](https://azure.microsoft.com/products/search) | Vector DB Lookup or Python      |
+| [Cognitive Search](https://azure.microsoft.com/en-us/products/search) | Vector DB Lookup or Python      |
 | [Serp](https://serpapi.com/)                                 | Serp API or Python              |
-| [Serverless](https://learn.microsoft.com/azure/ai-studio/concepts/deployments-overview#deploy-models-as-serverless-apis)                                               | LLM or Python                   |
+| [Serverless](https://learn.microsoft.com/en-us/azure/ai-studio/concepts/deployments-overview#deploy-models-with-model-as-a-service-maas)                                               | LLM or Python                   |
 | Custom                                                       | Python                          |
 
 By leveraging connections in prompt flow, you can easily establish and manage connections to external APIs and data sources, facilitating efficient data exchange and interaction within their AI applications.

docs/reference/index.md

@@ -66,7 +66,6 @@ tools-reference/open_model_llm_tool
 tools-reference/openai-gpt-4v-tool
 tools-reference/contentsafety_text_tool
 tools-reference/aoai-gpt4-turbo-vision
-tools-reference/rerank-tool
 ```
 
 ```{toctree}

docs/reference/pf-command-reference.md

@@ -1,5 +1,9 @@
 # pf
 
+:::{admonition} Experimental feature
+This is an experimental feature, and may change at any time. Learn [more](../how-to-guides/faq.md#stable-vs-experimental).
+:::
+
 Manage prompt flow resources with the prompt flow CLI.
 
 | Command                         | Description                    |

docs/reference/tools-reference/llm-tool.md

@@ -25,7 +25,7 @@ Create OpenAI resources, Azure OpenAI resources or MaaS deployment with the LLM
 
 - **MaaS deployment**
 
-    Create MaaS deployment for models in Azure AI Studio model catalog with [instruction](https://learn.microsoft.com/azure/ai-studio/concepts/deployments-overview#deploy-models-as-serverless-apis)
+    Create MaaS deployment for models in Azure AI Studio model catalog with [instruction](https://learn.microsoft.com/en-us/azure/ai-studio/concepts/deployments-overview#deploy-models-with-model-as-a-service-maas)
 
     You can create serverless connection to use this MaaS deployment.