🚧 Start removing blocks

Signed-off-by: Evaline Ju <[email protected]>
wgifford · May 16, 2023 · da827e9 · da827e9
1 parent db0b203
commit da827e9
Show file tree

Hide file tree

Showing 47 changed files with 225 additions and 620 deletions.
diff --git a/caikit/core/__init__.py b/caikit/core/__init__.py
@@ -30,8 +30,7 @@
 _warnings.filterwarnings("ignore")
 
 # Local
-from . import blocks, data_model, module, module_config, resources, toolkit, workflows
-from .blocks.base import BlockBase, block
+from . import data_model, module, module_config, resources, toolkit, workflows
 from .data_model import DataObjectBase, dataobject
 from .model_manager import *
 from .module import *

diff --git a/caikit/core/blocks/__init__.py b/caikit/core/blocks/__init__.py
diff --git a/caikit/core/blocks/base.py b/caikit/core/blocks/base.py
diff --git a/caikit/runtime/service_generation/rpcs.py b/caikit/runtime/service_generation/rpcs.py
@@ -168,9 +168,9 @@ def _module_class_to_req_name(self) -> str:
         """Helper function to convert from the name of a module to the name of the
         request RPC message
 
-        Example: self.clz._module__ = sample_lib.blocks.sample_task.sample_implementation
+        Example: self.clz._module__ = sample_lib.modules.sample_task.sample_implementation
 
-        return: BlocksSampleTaskSampleBlockTrainRequest
+        return: BlocksSampleTaskSampleModuleTrainRequest
 
         """
         module_split = self.clz.__module__.split(".")

diff --git a/caikit/runtime/servicers/global_train_servicer.py b/caikit/runtime/servicers/global_train_servicer.py
@@ -114,8 +114,8 @@ def Train(self, request, *_, **__) -> TrainingJob:
 
         try:
             with alog.ContextLog(log.debug, outer_scope_name):
-                # BlocksSampleTaskSampleBlockTrainRequest
-                # getattr(importlib.import_module("sample_lib.blocks.sample_task"), "SampleBlock")
+                # BlocksSampleTaskSampleModuleTrainRequest
+                # getattr(importlib.import_module("sample_lib.modules.sample_task"), "SampleModule")
                 # TODO: fixme - temporary workaround for now
                 desc_name = desc_name.replace("TrainRequest", "")
                 split = re.split("(?<=.)(?=[A-Z])", desc_name)

diff --git a/examples/text-sentiment/models/text_sentiment/config.yml b/examples/text-sentiment/models/text_sentiment/config.yml
@@ -13,5 +13,5 @@
 # limitations under the License.
 
 block_id: 8f72161-c0e4-49b0-8fd0-7587b3017a35
-name: HuggingFaceSentimentBlock
+name: HuggingFaceSentimentModule
 version: 0.0.1
diff --git a/examples/text-sentiment/text_sentiment/runtime_model/__init__.py b/examples/text-sentiment/text_sentiment/runtime_model/__init__.py
@@ -13,4 +13,4 @@
 # limitations under the License.
 # # Local
 # Local
-from .hf_block import HuggingFaceSentimentBlock
+from .hf_module import HuggingFaceSentimentModule
diff --git a/.../text_sentiment/runtime_model/hf_block.py → ...text_sentiment/runtime_model/hf_module.py b/.../text_sentiment/runtime_model/hf_block.py → ...text_sentiment/runtime_model/hf_module.py
@@ -19,16 +19,16 @@
 from transformers import pipeline
 
 # Local
-from caikit.core import BlockBase, ModuleLoader, ModuleSaver, block
+from caikit.core import ModuleBase, ModuleLoader, ModuleSaver, module
 from text_sentiment.data_model.classification import (
     ClassificationPrediction,
     ClassInfo,
     TextInput,
 )
 
 
-@block("8f72161-c0e4-49b0-8fd0-7587b3017a35", "HuggingFaceSentimentBlock", "0.0.1")
-class HuggingFaceSentimentBlock(BlockBase):
+@module("8f72161-c0e4-49b0-8fd0-7587b3017a35", "HuggingFaceSentimentModule", "0.0.1")
+class HuggingFaceSentimentModule(ModuleBase):
     """Class to wrap sentiment analysis pipeline from HuggingFace"""
 
     def __init__(self, model_path) -> None:

diff --git a/tests/core/blocks/__init__.py b/tests/core/blocks/__init__.py