diff --git a/examples/extension_service/servicer.py b/examples/extension_service/servicer.py index bcfca7c606378dc8794cca3900ea7c947b9a6a75..f40984ed2a2c59996101f40f42ea6077b864377e 100644 --- a/examples/extension_service/servicer.py +++ b/examples/extension_service/servicer.py @@ -4,8 +4,8 @@ from constants import extension from constants import collections as extension_collections -from perxis.items.utils import datasource_items_from_collections, sync_policies_from_collections -from perxis.items.models import DataSourceItem, SyncPolicyItem, Item, IfCollectionExists, IfExtensionInstalled +from perxis.extensions.utils import datasource_items_from_collections, sync_policies_from_collections +from perxis.extensions.item_models import DataSourceItem, SyncPolicyItem, Item, IfCollectionExists, IfExtensionInstalled from perxis.extensions.actions import make_action_dict from perxis.extensions import extension_service_pb2 from perxis.extensions.extension_service import ExtensionService diff --git a/perxis/extensions/extension_service.py b/perxis/extensions/extension_service.py index dc98f82cfa8518a4d9e330449fbfbb5784f83b1b..3799b340c03214128f30ce680362764c27c17cde 100644 --- a/perxis/extensions/extension_service.py +++ b/perxis/extensions/extension_service.py @@ -27,7 +27,7 @@ from perxis.common import operation_pb2, operation_service_pb2_grpc, operation_s from perxis.collections import collections_pb2_grpc, collections_pb2 from perxis.environments import environments_pb2_grpc from perxis.extensions.extension_setup import ExtensionSetup -from perxis.items.models import AbstractItem +from perxis.extensions.item_models import AbstractItem def generate_operation_id() -> str: diff --git a/perxis/extensions/extension_setup.py b/perxis/extensions/extension_setup.py index c613f5670180799acbd6c894159b2766f806cdba..41e9f55fa60b21b9495113203ab9250f0fc2eb62 100644 --- a/perxis/extensions/extension_setup.py +++ b/perxis/extensions/extension_setup.py @@ -16,7 +16,7 @@ from perxis.common import common_pb2 from perxis.clients import clients_pb2_grpc, clients_pb2 from perxis.environments import environments_pb2_grpc, environments_pb2 from perxis.extensions.actions import make_action_item, ACTIONS_COLLECTION_ID -from perxis.items.models import AbstractItem, SyncPolicyItem +from perxis.extensions.item_models import AbstractItem, SyncPolicyItem from perxis.provider import PerxisItemsWrapper diff --git a/perxis/items/models.py b/perxis/extensions/item_models.py similarity index 97% rename from perxis/items/models.py rename to perxis/extensions/item_models.py index bbbfeca09783007a178049b6727dbf6652875a33..036f3baf11b2b2a2c2fe9e1c0af0c3c2cbcdb559 100644 --- a/perxis/items/models.py +++ b/perxis/extensions/item_models.py @@ -2,7 +2,7 @@ import abc from google.protobuf.struct_pb2 import Struct -from perxis.items.rules import AbstractRule, IfCollectionExists, IfExtensionInstalled +from perxis.extensions.item_rules import AbstractRule, IfCollectionExists, IfExtensionInstalled class AbstractItem(metaclass=abc.ABCMeta): diff --git a/perxis/items/rules.py b/perxis/extensions/item_rules.py similarity index 98% rename from perxis/items/rules.py rename to perxis/extensions/item_rules.py index fcd2a6da026893c46f06b5f85b3a7123dc216bdc..106a98e28a942b7b4da215ec468227e30d7a8e01 100644 --- a/perxis/items/rules.py +++ b/perxis/extensions/item_rules.py @@ -7,7 +7,7 @@ from perxis.extensions import manager_service_pb2 if typing.TYPE_CHECKING: - from perxis.items.models import AbstractItem + from perxis.extensions.item_models import AbstractItem class AbstractRule(metaclass=abc.ABCMeta): diff --git a/perxis/extensions/utils.py b/perxis/extensions/utils.py index 1075b3bad5fd0da93e03e89e2af862e612d426e7..b5ba8e632b01ca0594f1c34e67d15d70c07ba223 100644 --- a/perxis/extensions/utils.py +++ b/perxis/extensions/utils.py @@ -1,6 +1,36 @@ from typing import Optional from perxis.extensions import manager_service_pb2 +from perxis.extensions.item_models import DataSourceItem, SyncPolicyItem + + +def datasource_items_from_collections(collections_map: dict[str, str]) -> list[DataSourceItem]: + """ + Создание записей источников данных на базе маппинга коллекций + """ + + return [ + DataSourceItem( + collection_id=collection_id + ) + for collection_id in collections_map + if collection_id + ] + + +def sync_policies_from_collections(collections_map: dict[str, str]) -> list[SyncPolicyItem]: + """ + Создание записей синхронизации коллекций на базе маппинга коллекций + """ + + return [ + SyncPolicyItem( + collection_id=collection_id, + name=collection_name, + ) + for collection_id, collection_name in collections_map.items() + if collection_id + ] def get_extension_descriptor( @@ -19,4 +49,4 @@ def get_extension_descriptor( version_description=ext_version_description, deps=ext_deps, url=ext_host - ) \ No newline at end of file + ) diff --git a/perxis/items/utils.py b/perxis/items/utils.py deleted file mode 100644 index dd91aa4ba0e384a3f52223df9918e5eb19f30ce9..0000000000000000000000000000000000000000 --- a/perxis/items/utils.py +++ /dev/null @@ -1,30 +0,0 @@ -from perxis.items.models import DataSourceItem, SyncPolicyItem - - -def datasource_items_from_collections(collections_map: dict[str, str]) -> list[DataSourceItem]: - """ - Создание записей источников данных на базе маппинга коллекций - """ - - return [ - DataSourceItem( - collection_id=collection_id - ) - for collection_id in collections_map - if collection_id - ] - - -def sync_policies_from_collections(collections_map: dict[str, str]) -> list[SyncPolicyItem]: - """ - Создание записей синхронизации коллекций на базе маппинга коллекций - """ - - return [ - SyncPolicyItem( - collection_id=collection_id, - name=collection_name, - ) - for collection_id, collection_name in collections_map.items() - if collection_id - ]