CRLF changed to LF (microsoft#2915)

.devcontainer/Dockerfile

@@ -1,32 +1,32 @@
-#-------------------------------------------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See LICENSE file in the project root for license information.
-#-------------------------------------------------------------------------------------------------------------
-
-FROM mcr.microsoft.com/vscode/devcontainers/python:3.10
-
-#
-# Update the OS and maybe install packages
-#
-ENV DEBIAN_FRONTEND=noninteractive
-
-# add git lhs to apt
-RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
-
-RUN apt-get update \
-   && apt-get upgrade -y  \
-   && apt-get -y install --no-install-recommends build-essential npm git-lfs \
-   && apt-get autoremove -y \
-   && apt-get clean -y \
-   && arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) \
-   && wget https://github.com/quarto-dev/quarto-cli/releases/download/v1.5.23/quarto-1.5.23-linux-${arch}.deb \
-   && dpkg -i quarto-1.5.23-linux-${arch}.deb \
-   && rm -rf /var/lib/apt/lists/* quarto-1.5.23-linux-${arch}.deb
-ENV DEBIAN_FRONTEND=dialog
-
-# For docs
-RUN npm install --global yarn
-RUN pip install --upgrade pip
-RUN pip install pydoc-markdown
-RUN pip install pyyaml
-RUN pip install colored
+#-------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See LICENSE file in the project root for license information.
+#-------------------------------------------------------------------------------------------------------------
+
+FROM mcr.microsoft.com/vscode/devcontainers/python:3.10
+
+#
+# Update the OS and maybe install packages
+#
+ENV DEBIAN_FRONTEND=noninteractive
+
+# add git lhs to apt
+RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
+
+RUN apt-get update \
+   && apt-get upgrade -y  \
+   && apt-get -y install --no-install-recommends build-essential npm git-lfs \
+   && apt-get autoremove -y \
+   && apt-get clean -y \
+   && arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) \
+   && wget https://github.com/quarto-dev/quarto-cli/releases/download/v1.5.23/quarto-1.5.23-linux-${arch}.deb \
+   && dpkg -i quarto-1.5.23-linux-${arch}.deb \
+   && rm -rf /var/lib/apt/lists/* quarto-1.5.23-linux-${arch}.deb
+ENV DEBIAN_FRONTEND=dialog
+
+# For docs
+RUN npm install --global yarn
+RUN pip install --upgrade pip
+RUN pip install pydoc-markdown
+RUN pip install pyyaml
+RUN pip install colored

.devcontainer/studio/Dockerfile

@@ -1,27 +1,27 @@
-#-------------------------------------------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See LICENSE file in the project root for license information.
-#-------------------------------------------------------------------------------------------------------------
-
-FROM mcr.microsoft.com/vscode/devcontainers/python:3.10
-
-#
-# Update the OS and maybe install packages
-#
-ENV DEBIAN_FRONTEND=noninteractive
-
-# add git lhs to apt
-RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
-
-RUN apt-get update \
-   && apt-get upgrade -y  \
-   && apt-get -y install --no-install-recommends build-essential npm git-lfs \
-   && apt-get autoremove -y \
-   && apt-get clean -y \
-   && rm -rf /var/lib/apt/lists/*
-ENV DEBIAN_FRONTEND=dialog
-
-# For docs
-RUN npm install --global yarn
-RUN pip install --upgrade pip
-RUN pip install pydoc-markdown
+#-------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See LICENSE file in the project root for license information.
+#-------------------------------------------------------------------------------------------------------------
+
+FROM mcr.microsoft.com/vscode/devcontainers/python:3.10
+
+#
+# Update the OS and maybe install packages
+#
+ENV DEBIAN_FRONTEND=noninteractive
+
+# add git lhs to apt
+RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
+
+RUN apt-get update \
+   && apt-get upgrade -y  \
+   && apt-get -y install --no-install-recommends build-essential npm git-lfs \
+   && apt-get autoremove -y \
+   && apt-get clean -y \
+   && rm -rf /var/lib/apt/lists/*
+ENV DEBIAN_FRONTEND=dialog
+
+# For docs
+RUN npm install --global yarn
+RUN pip install --upgrade pip
+RUN pip install pydoc-markdown

test/test_notebook.py

@@ -1,137 +1,137 @@
-#!/usr/bin/env python3 -m pytest
-
-import os
-import sys
-
-import pytest
-from conftest import skip_openai
-
-try:
-    import openai
-except ImportError:
-    skip = True
-else:
-    skip = False or skip_openai
-
-
-here = os.path.abspath(os.path.dirname(__file__))
-
-
-def run_notebook(input_nb, output_nb="executed_openai_notebook.ipynb", save=False):
-    import nbformat
-    from nbconvert.preprocessors import CellExecutionError, ExecutePreprocessor
-
-    try:
-        nb_loc = os.path.join(here, os.pardir, "notebook")
-        file_path = os.path.join(nb_loc, input_nb)
-        with open(file_path) as nb_file:
-            nb = nbformat.read(nb_file, as_version=4)
-        preprocessor = ExecutePreprocessor(timeout=4800, kernel_name="python3")
-        preprocessor.preprocess(nb, {"metadata": {"path": nb_loc}})
-
-        output_file_name = "executed_openai_notebook_output.txt"
-        output_file = os.path.join(here, output_file_name)
-        with open(output_file, "a") as nb_output_file:
-            for cell in nb.cells:
-                if cell.cell_type == "code" and "outputs" in cell:
-                    for output in cell.outputs:
-                        if "text" in output:
-                            nb_output_file.write(output["text"].strip() + "\n")
-                        elif "data" in output and "text/plain" in output["data"]:
-                            nb_output_file.write(output["data"]["text/plain"].strip() + "\n")
-    except CellExecutionError:
-        raise
-    finally:
-        if save:
-            with open(os.path.join(here, output_nb), "w", encoding="utf-8") as nb_executed_file:
-                nbformat.write(nb, nb_executed_file)
-
-
-@pytest.mark.skipif(
-    skip or not sys.version.startswith("3.10"),
-    reason="do not run if openai is not installed or py!=3.10",
-)
-def test_agentchat_auto_feedback_from_code(save=False):
-    run_notebook("agentchat_auto_feedback_from_code_execution.ipynb", save=save)
-
-
-@pytest.mark.skipif(
-    skip or not sys.version.startswith("3.11"),
-    reason="do not run if openai is not installed or py!=3.11",
-)
-def _test_oai_completion(save=False):
-    run_notebook("oai_completion.ipynb", save=save)
-
-
-@pytest.mark.skipif(
-    skip or not sys.version.startswith("3.12"),
-    reason="do not run if openai is not installed or py!=3.12",
-)
-def test_agentchat_function_call(save=False):
-    run_notebook("agentchat_function_call.ipynb", save=save)
-
-
-@pytest.mark.skipif(
-    skip or not sys.version.startswith("3.10"),
-    reason="do not run if openai is not installed or py!=3.10",
-)
-def test_agentchat_function_call_currency_calculator(save=False):
-    run_notebook("agentchat_function_call_currency_calculator.ipynb", save=save)
-
-
-@pytest.mark.skipif(
-    skip or not sys.version.startswith("3.11"),
-    reason="do not run if openai is not installed or py!=3.11",
-)
-def test_agentchat_function_call_async(save=False):
-    run_notebook("agentchat_function_call_async.ipynb", save=save)
-
-
-@pytest.mark.skipif(
-    skip or not sys.version.startswith("3.12"),
-    reason="do not run if openai is not installed or py!=3.12",
-)
-def _test_agentchat_MathChat(save=False):
-    run_notebook("agentchat_MathChat.ipynb", save=save)
-
-
-@pytest.mark.skipif(
-    skip or not sys.version.startswith("3.10"),
-    reason="do not run if openai is not installed or py!=3.10",
-)
-def _test_oai_chatgpt_gpt4(save=False):
-    run_notebook("oai_chatgpt_gpt4.ipynb", save=save)
-
-
-@pytest.mark.skipif(
-    skip or not sys.version.startswith("3.12"),
-    reason="do not run if openai is not installed or py!=3.12",
-)
-def test_agentchat_groupchat_finite_state_machine(save=False):
-    run_notebook("agentchat_groupchat_finite_state_machine.ipynb", save=save)
-
-
-@pytest.mark.skipif(
-    skip or not sys.version.startswith("3.10"),
-    reason="do not run if openai is not installed or py!=3.10",
-)
-def test_agentchat_cost_token_tracking(save=False):
-    run_notebook("agentchat_cost_token_tracking.ipynb", save=save)
-
-
-@pytest.mark.skipif(
-    skip or not sys.version.startswith("3.11"),
-    reason="do not run if openai is not installed or py!=3.11",
-)
-def test_agentchat_groupchat_stateflow(save=False):
-    run_notebook("agentchat_groupchat_stateflow.ipynb", save=save)
-
-
-if __name__ == "__main__":
-    # test_agentchat_auto_feedback_from_code(save=True)
-    # test_oai_chatgpt_gpt4(save=True)
-    # test_oai_completion(save=True)
-    # test_agentchat_MathChat(save=True)
-    # test_agentchat_function_call(save=True)
-    # test_graph_modelling_language_using_select_speaker(save=True)
-    test_agentchat_function_call_async(save=True)
+#!/usr/bin/env python3 -m pytest
+
+import os
+import sys
+
+import pytest
+from conftest import skip_openai
+
+try:
+    import openai
+except ImportError:
+    skip = True
+else:
+    skip = False or skip_openai
+
+
+here = os.path.abspath(os.path.dirname(__file__))
+
+
+def run_notebook(input_nb, output_nb="executed_openai_notebook.ipynb", save=False):
+    import nbformat
+    from nbconvert.preprocessors import CellExecutionError, ExecutePreprocessor
+
+    try:
+        nb_loc = os.path.join(here, os.pardir, "notebook")
+        file_path = os.path.join(nb_loc, input_nb)
+        with open(file_path) as nb_file:
+            nb = nbformat.read(nb_file, as_version=4)
+        preprocessor = ExecutePreprocessor(timeout=4800, kernel_name="python3")
+        preprocessor.preprocess(nb, {"metadata": {"path": nb_loc}})
+
+        output_file_name = "executed_openai_notebook_output.txt"
+        output_file = os.path.join(here, output_file_name)
+        with open(output_file, "a") as nb_output_file:
+            for cell in nb.cells:
+                if cell.cell_type == "code" and "outputs" in cell:
+                    for output in cell.outputs:
+                        if "text" in output:
+                            nb_output_file.write(output["text"].strip() + "\n")
+                        elif "data" in output and "text/plain" in output["data"]:
+                            nb_output_file.write(output["data"]["text/plain"].strip() + "\n")
+    except CellExecutionError:
+        raise
+    finally:
+        if save:
+            with open(os.path.join(here, output_nb), "w", encoding="utf-8") as nb_executed_file:
+                nbformat.write(nb, nb_executed_file)
+
+
+@pytest.mark.skipif(
+    skip or not sys.version.startswith("3.10"),
+    reason="do not run if openai is not installed or py!=3.10",
+)
+def test_agentchat_auto_feedback_from_code(save=False):
+    run_notebook("agentchat_auto_feedback_from_code_execution.ipynb", save=save)
+
+
+@pytest.mark.skipif(
+    skip or not sys.version.startswith("3.11"),
+    reason="do not run if openai is not installed or py!=3.11",
+)
+def _test_oai_completion(save=False):
+    run_notebook("oai_completion.ipynb", save=save)
+
+
+@pytest.mark.skipif(
+    skip or not sys.version.startswith("3.12"),
+    reason="do not run if openai is not installed or py!=3.12",
+)
+def test_agentchat_function_call(save=False):
+    run_notebook("agentchat_function_call.ipynb", save=save)
+
+
+@pytest.mark.skipif(
+    skip or not sys.version.startswith("3.10"),
+    reason="do not run if openai is not installed or py!=3.10",
+)
+def test_agentchat_function_call_currency_calculator(save=False):
+    run_notebook("agentchat_function_call_currency_calculator.ipynb", save=save)
+
+
+@pytest.mark.skipif(
+    skip or not sys.version.startswith("3.11"),
+    reason="do not run if openai is not installed or py!=3.11",
+)
+def test_agentchat_function_call_async(save=False):
+    run_notebook("agentchat_function_call_async.ipynb", save=save)
+
+
+@pytest.mark.skipif(
+    skip or not sys.version.startswith("3.12"),
+    reason="do not run if openai is not installed or py!=3.12",
+)
+def _test_agentchat_MathChat(save=False):
+    run_notebook("agentchat_MathChat.ipynb", save=save)
+
+
+@pytest.mark.skipif(
+    skip or not sys.version.startswith("3.10"),
+    reason="do not run if openai is not installed or py!=3.10",
+)
+def _test_oai_chatgpt_gpt4(save=False):
+    run_notebook("oai_chatgpt_gpt4.ipynb", save=save)
+
+
+@pytest.mark.skipif(
+    skip or not sys.version.startswith("3.12"),
+    reason="do not run if openai is not installed or py!=3.12",
+)
+def test_agentchat_groupchat_finite_state_machine(save=False):
+    run_notebook("agentchat_groupchat_finite_state_machine.ipynb", save=save)
+
+
+@pytest.mark.skipif(
+    skip or not sys.version.startswith("3.10"),
+    reason="do not run if openai is not installed or py!=3.10",
+)
+def test_agentchat_cost_token_tracking(save=False):
+    run_notebook("agentchat_cost_token_tracking.ipynb", save=save)
+
+
+@pytest.mark.skipif(
+    skip or not sys.version.startswith("3.11"),
+    reason="do not run if openai is not installed or py!=3.11",
+)
+def test_agentchat_groupchat_stateflow(save=False):
+    run_notebook("agentchat_groupchat_stateflow.ipynb", save=save)
+
+
+if __name__ == "__main__":
+    # test_agentchat_auto_feedback_from_code(save=True)
+    # test_oai_chatgpt_gpt4(save=True)
+    # test_oai_completion(save=True)
+    # test_agentchat_MathChat(save=True)
+    # test_agentchat_function_call(save=True)
+    # test_graph_modelling_language_using_select_speaker(save=True)
+    test_agentchat_function_call_async(save=True)