Fixed dependency namings

deeppavlov · Oct 23, 2024 · 284555d · 284555d
1 parent ca79f94
commit 284555d
Show file tree

Hide file tree

Showing 26 changed files with 52 additions and 512 deletions.
diff --git a/...t/conditions/llm_conditions/conditions.py → chatsky/conditions/ml.py b/...t/conditions/llm_conditions/conditions.py → chatsky/conditions/ml.py
@@ -8,15 +8,15 @@
 from functools import singledispatch
 
 try:
+    #!!! remove sklearn, use something else instead
     from sklearn.metrics.pairwise import cosine_similarity
 
     sklearn_available = True
 except ImportError:
     sklearn_available = False
-from chatsky.script import Context
-from chatsky.pipeline import Pipeline
-from chatsky.script.conditions.llm_conditions.dataset import DatasetItem
-from chatsky.script.conditions.llm_conditions.models.base_model import ExtrasBaseModel
+from chatsky import Context, Pipeline
+from chatsky.ml.dataset import DatasetItem
+from chatsky.ml.models.base_model import ExtrasBaseModel
 
 
 @singledispatch
@@ -92,7 +92,7 @@ def has_match(
     any of the pre-defined intent utterances.
     The model passed to this function should be in the fit state.
 
-    :param model: Any model from the :py:mod:`~chatsky.script.conditions.llm_conditions.models.local.cosine_matchers` module.
+    :param model: Any model from the :py:mod:`~chatsky.ml.models.local.cosine_matchers` module.
     :param positive_examples: Utterances that the request should match.
     :param negative_examples: Utterances that the request should not match.
     :param threshold: Similarity threshold that triggers a positive response from the function.

diff --git a/...ipt/conditions/llm_conditions/__init__.py → chatsky/ml/__init__.py b/...ipt/conditions/llm_conditions/__init__.py → chatsky/ml/__init__.py
diff --git a/...ript/conditions/llm_conditions/dataset.py → chatsky/ml/dataset.py b/...ript/conditions/llm_conditions/dataset.py → chatsky/ml/dataset.py
diff --git a/chatsky/ml/models/__init__.py b/chatsky/ml/models/__init__.py
@@ -0,0 +1,3 @@
+from .remote_api.google_dialogflow_model import GoogleDialogFlowModel, AsyncGoogleDialogFlowModel  # noqa: F401
+from .remote_api.rasa_model import AsyncRasaModel, RasaModel  # noqa: F401
+from .remote_api.hf_api_model import AsyncHFAPIModel, HFAPIModel  # noqa: F401
diff --git a/...tions/llm_conditions/models/base_model.py → chatsky/ml/models/base_model.py b/...tions/llm_conditions/models/base_model.py → chatsky/ml/models/base_model.py
@@ -7,9 +7,9 @@
 from copy import copy
 from abc import ABC, abstractmethod
 
-from chatsky.script import Context
+from chatsky import Context
 
-from chatsky.script.conditions.llm_conditions.dataset import Dataset
+from chatsky.ml.dataset import Dataset
 
 import asyncio
 from async_lru import alru_cache

diff --git a/..._conditions/models/remote_api/__init__.py → chatsky/ml/models/remote_api/__init__.py b/..._conditions/models/remote_api/__init__.py → chatsky/ml/models/remote_api/__init__.py
diff --git a/...nditions/models/remote_api/async_mixin.py → chatsky/ml/models/remote_api/async_mixin.py b/...nditions/models/remote_api/async_mixin.py → chatsky/ml/models/remote_api/async_mixin.py
@@ -5,8 +5,8 @@
 This module provides the mixin that overrides the :py:meth:`__call__` method
 in all the descendants making them asynchronous.
 """
-from chatsky.script import Context
-from chatsky.script.conditions.llm_conditions.models.base_model import ExtrasBaseModel
+from chatsky import Context
+from chatsky.ml.models.base_model import ExtrasBaseModel
 
 
 class AsyncMixin(ExtrasBaseModel):

diff --git a/...els/remote_api/google_dialogflow_model.py → ...els/remote_api/google_dialogflow_model.py b/...els/remote_api/google_dialogflow_model.py → ...els/remote_api/google_dialogflow_model.py
@@ -11,8 +11,8 @@
 from pathlib import Path
 from async_lru import alru_cache
 
-from chatsky.script.conditions.llm_conditions.models.base_model import ExtrasBaseModel
-from chatsky.script.conditions.llm_conditions.models.remote_api.async_mixin import AsyncMixin
+from chatsky.ml.models.base_model import ExtrasBaseModel
+from chatsky.ml.models.remote_api.async_mixin import AsyncMixin
 
 try:
     from google.cloud import dialogflow_v2

diff --git a/...ditions/models/remote_api/hf_api_model.py → chatsky/ml/models/remote_api/hf_api_model.py b/...ditions/models/remote_api/hf_api_model.py → chatsky/ml/models/remote_api/hf_api_model.py
@@ -21,8 +21,8 @@
 except ImportError:
     hf_api_available = False
 
-from chatsky.script.conditions.llm_conditions.models.base_model import ExtrasBaseModel
-from chatsky.script.conditions.llm_conditions.models.remote_api.async_mixin import AsyncMixin
+from chatsky.ml.models.base_model import ExtrasBaseModel
+from chatsky.ml.models.remote_api.async_mixin import AsyncMixin
 
 
 class AbstractHFAPIModel(ExtrasBaseModel):

diff --git a/...onditions/models/remote_api/rasa_model.py → chatsky/ml/models/remote_api/rasa_model.py b/...onditions/models/remote_api/rasa_model.py → chatsky/ml/models/remote_api/rasa_model.py
@@ -21,9 +21,9 @@
     rasa_available = False
 
 from http import HTTPStatus
-from chatsky.script.conditions.llm_conditions.utils import RasaResponse
-from chatsky.script.conditions.llm_conditions.models.base_model import ExtrasBaseModel
-from chatsky.script.conditions.llm_conditions.models.remote_api.async_mixin import AsyncMixin
+from chatsky.ml.utils import RasaResponse
+from chatsky.ml.models.base_model import ExtrasBaseModel
+from chatsky.ml.models.remote_api.async_mixin import AsyncMixin
 
 
 class AbstractRasaModel(ExtrasBaseModel):

diff --git a/...script/conditions/llm_conditions/utils.py → chatsky/ml/utils.py b/...script/conditions/llm_conditions/utils.py → chatsky/ml/utils.py
diff --git a/chatsky/script/conditions/llm_conditions/models/__init__.py b/chatsky/script/conditions/llm_conditions/models/__init__.py
diff --git a/chatsky/script/core/context.py b/chatsky/script/core/context.py
diff --git a/tests/script/extras/conditions/conftest.py b/tests/script/extras/conditions/conftest.py
@@ -1,7 +1,7 @@
 import pytest
 
-from chatsky.pipeline import Pipeline
-from chatsky.script.conditions.llm_conditions.dataset import Dataset
+from chatsky import Pipeline
+from chatsky.ml.dataset import Dataset
 from chatsky.utils.testing.toy_script import TOY_SCRIPT
 
 from tests.test_utils import get_path_from_tests_to_current_dir