From 7f28c31d3d901a402470b46aae3146b6b051488f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Jun 2024 16:34:58 +0000 Subject: [PATCH 1/2] build: bump semantic-kernel from 1.0.4 to 1.1.1 Bumps [semantic-kernel](https://github.com/microsoft/semantic-kernel) from 1.0.4 to 1.1.1. - [Release notes](https://github.com/microsoft/semantic-kernel/releases) - [Commits](https://github.com/microsoft/semantic-kernel/compare/python-1.0.4...python-1.1.1) --- updated-dependencies: - dependency-name: semantic-kernel dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- poetry.lock | 16 ++++++++-------- pyproject.toml | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/poetry.lock b/poetry.lock index e63ac53ef..057e09519 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand. [[package]] name = "aiohttp" @@ -5913,13 +5913,13 @@ jeepney = ">=0.6" [[package]] name = "semantic-kernel" -version = "1.0.4" +version = "1.1.1" description = "Semantic Kernel Python SDK" optional = false python-versions = "<3.13,>=3.10" files = [ - {file = "semantic_kernel-1.0.4-py3-none-any.whl", hash = "sha256:75b41fe4a71e26ab6cced3ad007902275a4405441deff7207e3cc3db09e40853"}, - {file = "semantic_kernel-1.0.4.tar.gz", hash = "sha256:69d9f799a486ee804c494cef5d5fd12555792dc8043673bea2781f4d0dcae0ae"}, + {file = "semantic_kernel-1.1.1-py3-none-any.whl", hash = "sha256:e88be9bc09f9b477aac91cdf397c9be6a1a74a88c2cb882ef1e0ce855565a846"}, + {file = "semantic_kernel-1.1.1.tar.gz", hash = "sha256:99d9e3b4b36b82edd901208b60fa1c71f708afe8258f66007f9356c65df5f2fd"}, ] [package.dependencies] @@ -5949,12 +5949,12 @@ scipy = [ ] [package.extras] -all = ["azure-core (>=1.28.0,<2.0.0)", "azure-cosmos (>=4.7.0,<5.0.0)", "azure-identity (>=1.13.0,<2.0.0)", "azure-search-documents (==11.6.0b4)", "chromadb (>=0.4.13,<0.5.0)", "google-generativeai (>=0.1)", "grpcio-status (>=1.53.0,<2.0.0)", "ipykernel (>=6.21.1,<7.0.0)", "milvus (>=2.3,<2.3.8)", "pinecone-client (>=3.0.0)", "psycopg[binary,pool] (>=3.1.9,<4.0.0)", "pyarrow (>=12.0.1,<17.0.0)", "pymilvus (>=2.3,<2.3.8)", "qdrant-client (>=1.9,<2.0)", "redis (>=4.6.0,<5.0.0)", "sentence-transformers (>=2.2.2,<3.0.0)", "torch (>=2.2.0,<3.0.0)", "transformers (>=4.28.1,<5.0.0)", "usearch (>=2.9,<3.0)", "weaviate-client (>=3.18,<5.0)"] +all = ["azure-core (>=1.28.0,<2.0.0)", "azure-cosmos (>=4.7.0,<5.0.0)", "azure-identity (>=1.13.0,<2.0.0)", "azure-search-documents (==11.6.0b4)", "chromadb (>=0.4.13,<0.6.0)", "google-generativeai (>=0.1)", "grpcio-status (>=1.53.0,<2.0.0)", "ipykernel (>=6.21.1,<7.0.0)", "milvus (>=2.3,<2.3.8)", "pinecone-client (>=3.0.0)", "psycopg[binary,pool] (>=3.1.9,<4.0.0)", "pyarrow (>=12.0.1,<17.0.0)", "pymilvus (>=2.3,<2.4.4)", "qdrant-client (>=1.9,<2.0)", "redis (>=4.6.0,<5.0.0)", "sentence-transformers (>=2.2.2,<3.0.0)", "torch (>=2.2.0,<3.0.0)", "transformers (>=4.28.1,<5.0.0)", "usearch (>=2.9,<3.0)", "weaviate-client (>=3.18,<5.0)"] azure = ["azure-core (>=1.28.0,<2.0.0)", "azure-cosmos (>=4.7.0,<5.0.0)", "azure-identity (>=1.13.0,<2.0.0)", "azure-search-documents (==11.6.0b4)"] -chromadb = ["chromadb (>=0.4.13,<0.5.0)"] +chromadb = ["chromadb (>=0.4.13,<0.6.0)"] google = ["google-generativeai (>=0.1)", "grpcio-status (>=1.53.0,<2.0.0)"] hugging-face = ["sentence-transformers (>=2.2.2,<3.0.0)", "torch (>=2.2.0,<3.0.0)", "transformers (>=4.28.1,<5.0.0)"] -milvus = ["milvus (>=2.3,<2.3.8)", "pymilvus (>=2.3,<2.3.8)"] +milvus = ["milvus (>=2.3,<2.3.8)", "pymilvus (>=2.3,<2.4.4)"] notebooks = ["ipykernel (>=6.21.1,<7.0.0)"] pinecone = ["pinecone-client (>=3.0.0)"] postgres = ["psycopg[binary,pool] (>=3.1.9,<4.0.0)"] @@ -7225,4 +7225,4 @@ test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools", [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "e0f8f13289957399cf53b01fff7c1ab4a5e48e43dfa0233b72b00804b46540aa" +content-hash = "6851993478185341e9827b889eb1c99e35a2102c26403a7d603c2fbf1139c74c" diff --git a/pyproject.toml b/pyproject.toml index 40081f88b..05bb2ae2e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,7 +37,7 @@ opentelemetry-instrumentation-httpx = "^0.46b0" pillow = "10.3.0" azure-mgmt-cognitiveservices = "^13.5.0" jsonschema = "^4.22.0" -semantic-kernel = {version = "1.0.4", python = "<3.13"} +semantic-kernel = {version = "1.1.1", python = "<3.13"} azure-ai-ml = "^1.16.0" [tool.poetry.group.dev.dependencies] From 0ddc8a3bd7a166374b0f79f02f233973a12bfb0a Mon Sep 17 00:00:00 2001 From: Adam Dougal Date: Thu, 20 Jun 2024 08:56:43 +0000 Subject: [PATCH 2/2] Fix imports --- .../utilities/orchestrator/semantic_kernel.py | 2 +- .../orchestrator/test_semantic_kernel.py | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/code/backend/batch/utilities/orchestrator/semantic_kernel.py b/code/backend/batch/utilities/orchestrator/semantic_kernel.py index 27b1b9fc5..96adcf4dd 100644 --- a/code/backend/batch/utilities/orchestrator/semantic_kernel.py +++ b/code/backend/batch/utilities/orchestrator/semantic_kernel.py @@ -5,7 +5,7 @@ from semantic_kernel.connectors.ai.function_call_behavior import FunctionCallBehavior from semantic_kernel.contents import ChatHistory from semantic_kernel.contents.chat_message_content import ChatMessageContent -from semantic_kernel.contents.finish_reason import FinishReason +from semantic_kernel.contents.utils.finish_reason import FinishReason from ..common.answer import Answer from ..helpers.llm_helper import LLMHelper diff --git a/code/tests/utilities/orchestrator/test_semantic_kernel.py b/code/tests/utilities/orchestrator/test_semantic_kernel.py index e34be33b0..c12d7e517 100644 --- a/code/tests/utilities/orchestrator/test_semantic_kernel.py +++ b/code/tests/utilities/orchestrator/test_semantic_kernel.py @@ -1,22 +1,24 @@ from unittest.mock import ANY, AsyncMock, MagicMock, call, patch import pytest -from backend.batch.utilities.common.answer import Answer -from backend.batch.utilities.orchestrator.semantic_kernel import ( - SemanticKernelOrchestrator, -) -from backend.batch.utilities.parser.output_parser_tool import OutputParserTool from semantic_kernel import Kernel from semantic_kernel.connectors.ai.open_ai import AzureChatCompletion from semantic_kernel.connectors.ai.function_call_behavior import EnabledFunctions from semantic_kernel.connectors.ai.open_ai.prompt_execution_settings.azure_chat_prompt_execution_settings import ( AzureChatPromptExecutionSettings, ) -from semantic_kernel.contents.author_role import AuthorRole +from semantic_kernel.contents.utils.author_role import AuthorRole from semantic_kernel.contents.chat_message_content import ChatMessageContent -from semantic_kernel.contents.finish_reason import FinishReason +from semantic_kernel.contents.utils.finish_reason import FinishReason from semantic_kernel.contents.function_call_content import FunctionCallContent +from backend.batch.utilities.common.answer import Answer +from backend.batch.utilities.orchestrator.semantic_kernel import ( + SemanticKernelOrchestrator, +) +from backend.batch.utilities.parser.output_parser_tool import OutputParserTool + + chat_message_default_content = ChatMessageContent( content="mock-response", role=AuthorRole.ASSISTANT,