Update to the new plugins system in core

README.md

@@ -20,7 +20,7 @@ Furthermore, the repository will contain **dummy/demo** strategies for each of t
 - Mapping (`mappingType`)
 - Parse (`mediaType`)
 - Resource (`accessService`)
-- Transformation (`transformation_type`)
+- Transformation (`transformationType`)
 
 These should be **updated** to **your specific needs** according to the strategy or strategies you intend to implement.
 The ones that are not used should be deleted.

{{ cookiecutter.project_slug }}/requirements.txt

@@ -1 +1 @@
-oteapi-core==0.0.4
+oteapi-core==0.0.5

{{ cookiecutter.project_slug }}/setup.cfg

@@ -1,13 +1,13 @@
 [options.entry_points]
-oteapi.download_strategy =
-  {{ cookiecutter.package_name }}.demo = {{ cookiecutter.package_name }}.strategies.download
-oteapi.filter_strategy =
-  {{ cookiecutter.package_name }}.demo = {{ cookiecutter.package_name }}.strategies.filter
-oteapi.mapping_strategy =
-  {{ cookiecutter.package_name }}.demo = {{ cookiecutter.package_name }}.strategies.mapping
-oteapi.resource_strategy =
-  {{ cookiecutter.package_name }}.demo = {{ cookiecutter.package_name }}.strategies.resource
-oteapi.transformation_strategy =
-  {{ cookiecutter.package_name }}.demo = {{ cookiecutter.package_name }}.strategies.transformation
-oteapi.parse_strategy =
-  {{ cookiecutter.package_name }}.demo = {{ cookiecutter.package_name }}.strategies.parse
+oteapi.download =
+  {{ cookiecutter.package_name }}.fileDEMO = {{ cookiecutter.package_name }}.strategies.download:DemoFileStrategy
+oteapi.filter =
+  {{ cookiecutter.package_name }}.filter/DEMO = {{ cookiecutter.package_name }}.strategies.filter:DemoFilter
+oteapi.mapping =
+  {{ cookiecutter.package_name }}.mapping/DEMO = {{ cookiecutter.package_name }}.strategies.mapping:DemoMappingStrategy
+oteapi.parse =
+  {{ cookiecutter.package_name }}.text/jsonDEMO = {{ cookiecutter.package_name }}.strategies.parse:DemoJSONDataParseStrategy
+oteapi.resource =
+  {{ cookiecutter.package_name }}.DEMO-access-service = {{ cookiecutter.package_name }}.strategies.resource:DemoResourceStrategy
+oteapi.transformation =
+  {{ cookiecutter.package_name }}.script/DEMO = {{ cookiecutter.package_name }}.strategies.transformation:DummyTransformationStrategy

{{ cookiecutter.project_slug }}/tests/conftest.py

@@ -4,7 +4,7 @@
 
 @pytest.fixture(scope="session", autouse=True)
 def load_plugins() -> None:
-    """Load plugins."""
-    from oteapi.plugins.plugins import load_plugins
+    """Load pip installed plugin strategies."""
+    from oteapi.plugins.factories import load_strategies
 
-    load_plugins()
+    load_strategies()

{{ cookiecutter.project_slug }}/tests/test_parse.py

@@ -21,6 +21,6 @@ def test_json():
         mediaType="text/jsonDEMO",
     )
     parser = DemoJSONDataParseStrategy(config)
-    json = parser.parse()
+    json = parser.get()
 
     assert json == data

{{ cookiecutter.project_slug }}/{{ cookiecutter.package_name }}/strategies/download.py

@@ -4,8 +4,7 @@
 from pathlib import Path
 from typing import TYPE_CHECKING, Optional
 
-from oteapi.datacache.datacache import DataCache
-from oteapi.plugins.factories import StrategyFactory
+from oteapi.datacache import DataCache
 from pydantic import BaseModel, Extra, Field
 
 if TYPE_CHECKING:
@@ -33,11 +32,10 @@ class FileConfig(BaseModel):
 
 
 @dataclass
-@StrategyFactory.register(("scheme", "fileDEMO"))
 class DemoFileStrategy:
     """Strategy for retrieving data via local file."""
 
-    resource_config: "ResourceConfig"
+    download_config: "ResourceConfig"
 
     def initialize(
         self, session: "Optional[Dict[str, Any]]" = None

{{ cookiecutter.project_slug }}/{{ cookiecutter.package_name }}/strategies/filter.py

@@ -3,7 +3,6 @@
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, List
 
-from oteapi.plugins.factories import StrategyFactory
 from pydantic import BaseModel, Field
 
 if TYPE_CHECKING:
@@ -19,7 +18,6 @@ class DemoDataModel(BaseModel):
 
 
 @dataclass
-@StrategyFactory.register(("filterType", "filter/DEMO"))
 class DemoFilter:
     """Filter Strategy."""
 

{{ cookiecutter.project_slug }}/{{ cookiecutter.package_name }}/strategies/mapping.py

@@ -3,16 +3,13 @@
 from dataclasses import dataclass
 from typing import TYPE_CHECKING
 
-from oteapi.plugins.factories import StrategyFactory
-
 if TYPE_CHECKING:
     from typing import Any, Dict, Optional
 
     from oteapi.models.mappingconfig import MappingConfig
 
 
 @dataclass
-@StrategyFactory.register(("mappingType", "mapping/DEMO"))
 class DemoMappingStrategy:
     """Mapping Strategy."""
 

{{ cookiecutter.project_slug }}/{{ cookiecutter.package_name }}/strategies/parse.py

@@ -4,8 +4,8 @@
 from dataclasses import dataclass
 from typing import TYPE_CHECKING
 
-from oteapi.datacache.datacache import DataCache
-from oteapi.plugins.factories import StrategyFactory, create_download_strategy
+from oteapi.datacache import DataCache
+from oteapi.plugins import create_strategy
 
 if TYPE_CHECKING:
     from typing import Any, Dict, Optional
@@ -14,11 +14,10 @@
 
 
 @dataclass
-@StrategyFactory.register(("mediaType", "text/jsonDEMO"))
 class DemoJSONDataParseStrategy:
     """Parse Strategy."""
 
-    resource_config: "ResourceConfig"
+    parse_config: "ResourceConfig"
 
     def initialize(
         self, session: "Optional[Dict[str, Any]]" = None
@@ -38,7 +37,7 @@ def initialize(
         """
         return {}
 
-    def parse(self, session: "Optional[Dict[str, Any]]" = None) -> "Dict[str, Any]":
+    def get(self, session: "Optional[Dict[str, Any]]" = None) -> "Dict[str, Any]":
         """Execute the strategy.
 
         This method will be called through the strategy-specific endpoint of the
@@ -52,7 +51,7 @@ def parse(self, session: "Optional[Dict[str, Any]]" = None) -> "Dict[str, Any]":
             dictionary context.
 
         """
-        downloader = create_download_strategy(self.resource_config)
+        downloader = create_strategy("download", self.resource_config)
         output = downloader.get()
         cache = DataCache(self.resource_config.configuration)
         content = cache.get(output["key"])

{{ cookiecutter.project_slug }}/{{ cookiecutter.package_name }}/strategies/resource.py

@@ -3,7 +3,7 @@
 from dataclasses import dataclass
 from typing import TYPE_CHECKING
 
-from oteapi.plugins.factories import StrategyFactory, create_download_strategy
+from oteapi.plugins import create_strategy
 
 if TYPE_CHECKING:
     from typing import Any, Dict, Optional
@@ -12,7 +12,6 @@
 
 
 @dataclass
-@StrategyFactory.register(("accessService", "DEMO-access-service"))
 class DemoResourceStrategy:
     """Resource Strategy."""
 
@@ -51,6 +50,6 @@ def get(self, session: "Optional[Dict[str, Any]]" = None) -> "Dict[str, Any]":
 
         """
         # Example of the plugin using the download strategy to fetch the data
-        download_strategy = create_download_strategy(self.resource_config)
+        download_strategy = create_strategy("download", self.resource_config)
         read_output = download_strategy.get(session)
         return {"output": read_output}

{{ cookiecutter.project_slug }}/{{ cookiecutter.package_name }}/strategies/transformation.py

@@ -4,8 +4,7 @@
 from datetime import datetime
 from typing import TYPE_CHECKING
 
-from oteapi.models.transformationconfig import TransformationStatus
-from oteapi.plugins.factories import StrategyFactory
+from oteapi.models import TransformationStatus
 
 if TYPE_CHECKING:
     from typing import Any, Dict, Optional
@@ -14,7 +13,6 @@
 
 
 @dataclass
-@StrategyFactory.register(("transformation_type", "script/DEMO"))
 class DummyTransformationStrategy:
     """Transformation Strategy."""