resolved merge conflicts with original repo

Author: changliu2

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/python:3.10
+FROM mcr.microsoft.com/devcontainers/python:3.11
 
 WORKDIR /
 
@@ -11,5 +11,5 @@ ENV LD_LIBRARY_PATH=$CONDA_PREFIX/lib:$LD_LIBRARY_PATH
 RUN apt update && apt install -y fuse
 
 # Install Python SDK
-COPY src/requirements.txt .
-RUN pip install -r requirements.txt 
+COPY src/requirements.freeze.txt .
+RUN pip install -r requirements.freeze.txt 

.devcontainer/devcontainer.json

@@ -20,10 +20,12 @@
 				"ms-azuretools.azure-dev"
 			]
 		}
-	}
+	},
 
 	// Features to add to the dev container. More info: https://containers.dev/features.
-	// "features": {},
+	"features": {
+		"ghcr.io/devcontainers/features/azure-cli:1": {}
+	},
 
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	// "forwardPorts": [],
@@ -36,4 +38,4 @@
 
 	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
 	// "remoteUser": "root"
-}
+}

README.md

@@ -852,4 +852,4 @@ def main():
         logging.info("Provisioning complete.")
 
 if __name__ == "__main__":
-    main()
+    main()

src/=0.7.1

@@ -0,0 +1,237 @@
+jsonpointer==3.0.0
+frozenlist==1.4.1
+cloudpickle==2.2.1
+tqdm==4.66.4
+h11==0.14.0
+MarkupSafe==2.1.5
+fixedint==0.1.6
+backports.weakref==1.0.post1
+contextlib2==21.6.0
+argcomplete==3.3.0
+jeepney==0.8.0
+blinker==1.8.2
+rapidfuzz==3.9.3
+six==1.16.0
+pycparser==2.22
+urllib3==2.2.1
+oauthlib==3.2.2
+filetype==1.2.0
+jsonpickle==3.2.1
+azureml-dataprep-native==41.0.0
+tabulate==0.9.0
+opencensus-context==0.1.3
+orjson==3.10.5
+shellingham==1.5.4
+pyasn1==0.6.0
+PyJWT==2.8.0
+graphql-core==3.2.3
+pillow==10.3.0
+click==8.1.7
+entrypoints==0.4
+fonttools==4.53.0
+greenlet==3.0.3
+certifi==2024.6.2
+pyparsing==3.1.2
+rpds-py==0.18.1
+typing_extensions==4.12.2
+lxml==5.2.2
+azureml-dataprep-rslex==2.22.2
+pytz==2024.1
+joblib==1.4.2
+python-iso639==2024.4.27
+annotated-types==0.7.0
+ujson==5.10.0
+distro==1.9.0
+Pygments==2.18.0
+cycler==0.12.1
+regex==2024.5.15
+sqlparse==0.5.0
+aniso8601==9.0.1
+backoff==2.2.1
+protobuf==4.25.3
+sniffio==1.3.1
+jmespath==1.0.1
+zipp==3.19.2
+numpy==1.26.4
+python-magic==0.4.27
+fsspec==2023.10.0
+filelock==3.15.1
+itsdangerous==2.2.0
+docutils==0.21.2
+ruamel.yaml.clib==0.2.8
+tzdata==2024.1
+wrapt==1.16.0
+threadpoolctl==3.5.0
+mmh3==4.1.0
+idna==3.7
+PyYAML==6.0.1
+psutil==5.9.8
+chardet==5.2.0
+jsonpath-python==1.0.6
+tenacity==8.3.0
+Markdown==3.6
+azure-common==1.1.28
+packaging==23.2
+dnspython==2.6.1
+multidict==6.0.5
+ply==3.11
+websocket-client==1.8.0
+humanfriendly==10.0
+colorama==0.4.6
+importlib_resources==6.4.0
+cachetools==5.3.3
+mdurl==0.1.2
+kiwisolver==1.4.5
+pathspec==0.12.1
+antlr4-python3-runtime==4.9.3
+python-multipart==0.0.9
+pkginfo==1.11.1
+attrs==23.2.0
+waitress==2.1.2
+python-dotenv==1.0.1
+more-itertools==10.3.0
+portalocker==2.8.2
+smmap==5.0.1
+bcrypt==4.1.3
+soupsieve==2.5
+charset-normalizer==3.3.2
+mypy-extensions==1.0.0
+jsonpatch==1.33
+aiosignal==1.3.1
+Mako==1.3.5
+Jinja2==3.1.4
+Werkzeug==3.0.3
+backports.tempfile==1.0
+isodate==0.6.1
+python-dateutil==2.9.0.post0
+querystring-parser==1.2.4
+langdetect==1.0.9
+cffi==1.16.0
+pyasn1_modules==0.4.0
+rsa==4.9
+graphql-relay==3.2.0
+uvicorn==0.30.1
+httpcore==1.0.5
+pydantic_core==2.18.4
+SQLAlchemy==2.0.30
+pydash==7.0.7
+emoji==2.12.1
+nltk==3.8.1
+googleapis-common-protos==1.63.1
+proto-plus==1.23.0
+opentelemetry-proto==1.25.0
+importlib_metadata==7.1.0
+contourpy==1.2.1
+pyarrow==15.0.2
+scipy==1.13.1
+ruamel.yaml==0.18.6
+Deprecated==1.2.14
+anyio==4.4.0
+marshmallow==3.21.3
+gunicorn==22.0.0
+knack==0.11.0
+email_validator==2.1.1
+yarl==1.9.4
+jsonpath-ng==1.6.1
+markdown-it-py==3.0.0
+omegaconf==2.3.0
+referencing==0.35.1
+jaraco.classes==3.4.0
+gitdb==4.0.11
+beautifulsoup4==4.11.2
+requests==2.32.3
+typing-inspect==0.9.0
+Flask==3.0.3
+pandas==2.2.2
+strictyaml==1.7.3
+cryptography==42.0.8
+PyNaCl==1.5.0
+google-auth==2.30.0
+graphene==3.3
+pydantic==2.7.4
+alembic==1.13.1
+opentelemetry-exporter-otlp-proto-common==1.25.0
+matplotlib==3.9.0
+scikit-learn==1.5.0
+opentelemetry-api==1.25.0
+httpx==0.27.0
+starlette==0.37.2
+watchfiles==0.22.0
+aiohttp==3.9.5
+rich==13.7.1
+omegaconf-argparse==1.0.1
+jsonschema-specifications==2023.12.1
+keyring==24.3.1
+GitPython==3.1.43
+azure-core==1.30.1
+requests-oauthlib==2.0.0
+docker==7.1.0
+tiktoken==0.5.2
+google_search_results==2.4.1
+tika==2.6.0
+dataclasses-json==0.6.7
+Flask-Cors==4.0.1
+msal==1.28.1
+adal==1.2.7
+pyOpenSSL==24.1.0
+SecretStorage==3.3.3
+paramiko==3.4.0
+google-api-core==2.19.0
+langsmith==0.1.77
+opentelemetry-semantic-conventions==0.46b0
+openai==1.13.3
+aiohttp-retry==2.8.3
+typer==0.12.3
+jsonschema==4.22.0
+azure-mgmt-core==1.4.0
+azure-search-documents==11.4.0
+azure-storage-blob==12.19.0
+azure-cosmos==4.7.0
+msrest==0.7.1
+unstructured-client==0.21.0
+msal-extensions==1.1.0
+ndg-httpsclient==0.5.1
+opencensus==0.11.4
+langchain-core==0.1.52
+opentelemetry-sdk==1.25.0
+fastapi-cli==0.0.4
+flask-restx==1.3.0
+azure-mgmt-cognitiveservices==13.5.0
+azure-mgmt-search==9.1.0
+azure-mgmt-authorization==4.0.0
+azure-mgmt-containerregistry==10.3.0
+azure-mgmt-keyvault==10.3.0
+azure-mgmt-network==25.4.0
+azure-mgmt-resource==23.0.1
+azure-mgmt-storage==21.1.0
+azure-storage-file-datalake==12.14.0
+azure-ai-formrecognizer==3.3.3
+azure-storage-file-share==12.10.1
+msrestazure==0.6.4
+unstructured==0.14.5
+azure-identity==1.16.0
+opencensus-ext-logging==0.1.1
+langchain-community==0.0.33
+langchain-text-splitters==0.0.2
+mlflow-skinny==2.13.2
+mlflow==2.13.2
+azure-monitor-opentelemetry-exporter==1.0.0b26
+opentelemetry-exporter-otlp-proto-http==1.25.0
+promptflow-tracing==1.11.0
+fastapi==0.111.0
+azure-graphrbac==0.61.1
+opencensus-ext-azure==1.1.13
+azureml-dataprep==5.1.6
+langchain==0.1.16
+azureml-mlflow==1.56.0
+promptflow-core==1.11.0
+azureml-core==1.56.0
+azure-ai-ml==1.16.0
+azureml-fsspec==1.3.1
+promptflow-devkit==1.11.0
+azureml-rag==0.2.31.1
+promptflow-azure==1.11.0
+promptflow==1.11.0
+promptflow-rag==0.1.0
+promptflow-evals==0.3.0
+promptflow-tools==1.4.0

src/=2.6

@@ -1,7 +1,6 @@
 openai
 azure-identity==1.16.0
 azure-search-documents==11.4.0
-azure-storage-file-share==12.10.1
 azure-ai-ml==1.16.0
 promptflow[azure]==1.11.0
 promptflow-tracing==1.11.0