Merge pull request #27 from allegro/MINOTAUR-1124

MINOTAUR-1124 | Lower minimal required version of python to 3.8

allms/models/__init__.py

@@ -1,4 +1,4 @@
-from typing import Type
+from typing import Dict, Type
 
 from allms.domain.enumerables import AvailableModels
 from allms.models.abstract import AbstractModel
@@ -20,7 +20,7 @@
 ]
 
 
-def get_available_models() -> dict[str, Type[AbstractModel]]:
+def get_available_models() -> Dict[str, Type[AbstractModel]]:
     return {
         AvailableModels.AZURE_OPENAI_MODEL: AzureOpenAIModel,
         AvailableModels.AZURE_LLAMA2_MODEL: AzureLlama2Model,

allms/models/abstract.py

@@ -167,7 +167,7 @@ async def _build_chat_prompts(
             self,
             prompt_template_args: dict,
             system_prompt: SystemMessagePromptTemplate
-    ) -> list[SystemMessagePromptTemplate | HumanMessagePromptTemplate]:
+    ) -> typing.List[typing.Union[SystemMessagePromptTemplate, HumanMessagePromptTemplate]]:
         human_message = HumanMessagePromptTemplate(prompt=PromptTemplate(**prompt_template_args))
         if not system_prompt:
             return [human_message]
@@ -330,7 +330,7 @@ def _validate_system_prompt(self, system_prompt: typing.Optional[str] = None) ->
                 raise ValueError(input_exception_message.get_system_prompt_contains_input_variables())
 
     @staticmethod
-    def _extract_input_variables_from_prompt(prompt: str) -> set[str]:
+    def _extract_input_variables_from_prompt(prompt: str) -> typing.Set[str]:
         input_variables_pattern = r'(?<!\{)\{([^{}]+)\}(?!\})'
         input_variables_set = set(re.findall(input_variables_pattern, prompt))
         return input_variables_set

pyproject.toml

@@ -1,13 +1,13 @@
 [tool.poetry]
 name = "allms"
-version = "1.0.4"
+version = "1.0.5"
 description = ""
 authors = ["Allegro Opensource <[email protected]>"]
 readme = "README.md"
 packages = [{include = "allms"}]
 
 [tool.poetry.dependencies]
-python = "^3.10"
+python = ">=3.8.1,<4.0"
 fsspec = "^2023.6.0"
 google-cloud-aiplatform = "1.38.0"
 pydash = "^7.0.6"

tests/conftest.py

@@ -1,5 +1,6 @@
 import asyncio
 import typing
+from contextlib import ExitStack
 from dataclasses import dataclass
 from unittest.mock import patch
 
@@ -36,13 +37,13 @@ def __init__(self, *args, **kwargs):
 def models():
     event_loop = asyncio.new_event_loop()
 
-    with (
-        patch("allms.models.vertexai_palm.CustomVertexAI", ModelWithoutAsyncRequestsMock),
-        patch("allms.models.vertexai_gemini.CustomVertexAI", ModelWithoutAsyncRequestsMock),
-        patch("allms.models.vertexai_gemma.VertexAIModelGardenWrapper", ModelWithoutAsyncRequestsMock),
-        patch("allms.models.azure_llama2.AzureMLOnlineEndpointAsync", ModelWithoutAsyncRequestsMock),
-        patch("allms.models.azure_mistral.AzureMLOnlineEndpointAsync", ModelWithoutAsyncRequestsMock)
-    ):
+    with ExitStack() as stack:
+        stack.enter_context(patch("allms.models.vertexai_palm.CustomVertexAI", ModelWithoutAsyncRequestsMock))
+        stack.enter_context(patch("allms.models.vertexai_gemini.CustomVertexAI", ModelWithoutAsyncRequestsMock))
+        stack.enter_context(patch("allms.models.vertexai_gemma.VertexAIModelGardenWrapper", ModelWithoutAsyncRequestsMock))
+        stack.enter_context(patch("allms.models.azure_llama2.AzureMLOnlineEndpointAsync", ModelWithoutAsyncRequestsMock))
+        stack.enter_context(patch("allms.models.azure_mistral.AzureMLOnlineEndpointAsync", ModelWithoutAsyncRequestsMock))
+
         return {
                 "azure_open_ai": AzureOpenAIModel(
                     config=AzureOpenAIConfiguration(