#540 renaming classes. Fixed missed updates for InputDataSerializatio…

…nHelper.

arekit/common/docs/parser.py

@@ -1,7 +1,7 @@
 from arekit.common.docs.base import Document
 from arekit.common.docs.parsed.base import ParsedDocument
-from arekit.common.pipeline.base import BasePipeline
-from arekit.common.pipeline.batching import BatchingPipeline
+from arekit.common.pipeline.base import BasePipelineLauncher
+from arekit.common.pipeline.batching import BatchingPipelineLauncher
 from arekit.common.pipeline.context import PipelineContext
 from arekit.common.pipeline.utils import BatchIterator
 from arekit.common.text.parsed import BaseParsedText
@@ -25,7 +25,7 @@ def parse(doc, pipeline_items, parent_ppl_ctx=None, src_key="input"):
  ctx = PipelineContext({src_key: doc.get_sentence(sent_ind)}, parent_ctx=parent_ppl_ctx)
 
  # Apply all the operations.
- BasePipeline.run(pipeline=pipeline_items, pipeline_ctx=ctx, src_key=src_key)
+ BasePipelineLauncher.run(pipeline=pipeline_items, pipeline_ctx=ctx, src_key=src_key)
 
  # Collecting the result.
  parsed_sentences.append(BaseParsedText(terms=ctx.provide("result")))
@@ -49,7 +49,7 @@ def parse_batch(doc, pipeline_items, batch_size, parent_ppl_ctx=None, src_key="i
  parent_ctx=parent_ppl_ctx)
 
  # Apply all the operations.
- BatchingPipeline.run(pipeline=pipeline_items, pipeline_ctx=ctx, src_key=src_key)
+ BatchingPipelineLauncher.run(pipeline=pipeline_items, pipeline_ctx=ctx, src_key=src_key)
 
  # Collecting the result.
  parsed_sentences += [BaseParsedText(terms=result) for result in ctx.provide("result")]

arekit/common/pipeline/base.py

@@ -2,7 +2,7 @@
 from arekit.common.pipeline.items.base import BasePipelineItem
 
 
-class BasePipeline:
+class BasePipelineLauncher:
 
  @staticmethod
  def run(pipeline, pipeline_ctx, src_key=None):

arekit/common/pipeline/batching.py

@@ -2,7 +2,7 @@
 from arekit.common.pipeline.items.base import BasePipelineItem
 
 
-class BatchingPipeline:
+class BatchingPipelineLauncher:
 
  @staticmethod
  def run(pipeline, pipeline_ctx, src_key=None):

arekit/contrib/utils/data/contents/opinions.py

@@ -2,7 +2,7 @@
 from arekit.common.data.input.providers.contents import ContentsProvider
 from arekit.common.linkage.base import LinkedDataWrapper
 from arekit.common.linkage.text_opinions import TextOpinionsLinkage
-from arekit.common.pipeline.base import BasePipeline
+from arekit.common.pipeline.base import BasePipelineLauncher
 from arekit.common.pipeline.context import PipelineContext
 from arekit.common.text_opinions.base import TextOpinion
 
@@ -14,7 +14,7 @@ def __init__(self, pipeline):
  results in a TextOpinionLinkage instances.
  pipeline: id -> ... -> TextOpinionLinkage[]
  """
- assert(isinstance(pipeline, BasePipeline))
+ assert(isinstance(pipeline, list))
  self.__pipeline = pipeline
  self.__current_id = None
 
@@ -38,7 +38,7 @@ def from_doc_ids(self, doc_ids, idle_mode=False):
  })
 
  # Launching pipeline with the passed context
- self.__pipeline.run(ctx)
+ BasePipelineLauncher.run(pipeline=self.__pipeline, pipeline_ctx=ctx)
 
  for linkage in ctx.provide("result"):
  assert(isinstance(linkage, LinkedDataWrapper))

arekit/contrib/utils/pipelines/items/sampling/base.py

@@ -2,7 +2,6 @@
 from arekit.common.data.storages.base import BaseRowsStorage
 from arekit.common.experiment.api.base_samples_io import BaseSamplesIO
 from arekit.common.experiment.data_type import DataType
-from arekit.common.pipeline.base import BasePipeline
 from arekit.common.pipeline.items.base import BasePipelineItem
 from arekit.contrib.utils.serializer import InputDataSerializationHelper
 
@@ -31,7 +30,7 @@ def __init__(self, rows_provider, samples_io, save_labels_func, storage, **kwarg
 
  def _serialize_iteration(self, data_type, pipeline, data_folding, doc_ids):
  assert(isinstance(data_type, DataType))
- assert(isinstance(pipeline, BasePipeline))
+ assert(isinstance(pipeline, list))
  assert(isinstance(data_folding, dict) or data_folding is None)
  assert(isinstance(doc_ids, list) or doc_ids is None)
  assert(doc_ids is not None or data_folding is not None)

arekit/contrib/utils/pipelines/text_opinion/extraction.py

@@ -4,7 +4,6 @@
 from arekit.common.docs.parsed.providers.entity_service import EntityServiceProvider
 from arekit.common.docs.parsed.service import ParsedDocumentService
 from arekit.common.docs.parser import DocumentParsers
-from arekit.common.pipeline.base import BasePipeline
 from arekit.common.pipeline.items.flatten import FlattenIterPipelineItem
 from arekit.common.pipeline.items.map import MapPipelineItem
 from arekit.common.pipeline.items.map_nested import MapNestedPipelineItem

arekit/contrib/utils/serializer.py

@@ -7,7 +7,6 @@
 from arekit.common.data.input.repositories.base import BaseInputRepository
 from arekit.common.data.input.repositories.sample import BaseInputSamplesRepository
 from arekit.common.data.storages.base import BaseRowsStorage
-from arekit.common.pipeline.base import BasePipeline
 from arekit.contrib.utils.data.contents.opinions import InputTextOpinionProvider
 
 logger = logging.getLogger(__name__)
@@ -28,7 +27,7 @@ def create_samples_repo(keep_labels, rows_provider, storage):
 
  @staticmethod
  def fill_and_write(pipeline, repo, target, writer, doc_ids_iter, desc=""):
- assert(isinstance(pipeline, BasePipeline))
+ assert(isinstance(pipeline, list))
  assert(isinstance(doc_ids_iter, Iterable))
  assert(isinstance(repo, BaseInputRepository))
 

tests/text/test_nested_entities.py

@@ -1,7 +1,7 @@
 import unittest
 
-from arekit.common.pipeline.base import BasePipeline
-from arekit.common.pipeline.batching import BatchingPipeline
+from arekit.common.pipeline.base import BasePipelineLauncher
+from arekit.common.pipeline.batching import BatchingPipelineLauncher
 from arekit.common.pipeline.context import PipelineContext
 from arekit.contrib.utils.pipelines.items.text.entities_default import TextEntitiesParser
 
@@ -16,16 +16,16 @@ class TestNestedEntities(unittest.TestCase):
 
  def test(self):
 
- ctx = BasePipeline.run(pipeline=[TextEntitiesParser()],
- pipeline_ctx=PipelineContext({"result": self.s.split()}))
+ ctx = BasePipelineLauncher.run(pipeline=[TextEntitiesParser()],
+  pipeline_ctx=PipelineContext({"result": self.s.split()}))
  parsed_text = ctx.provide("result")
 
  print(parsed_text)
 
  def test_batched(self):
 
  # Compose a single batch with two sentences.
- ctx = BatchingPipeline.run(
+ ctx = BatchingPipelineLauncher.run(
  pipeline=[TextEntitiesParser()],
  pipeline_ctx=PipelineContext({"result": [self.s.split(), self.s.split()]}))
  parsed_text = ctx.provide("result")