deltafi 2.0rc1724965202427__tar.gz → 2.0rc1725634019389__tar.gz

{deltafi-2.0rc1724965202427 → deltafi-2.0rc1725634019389}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deltafi
-Version: 2.0rc1724965202427
+Version: 2.0rc1725634019389
 Summary: SDK for DeltaFi plugins and actions
 License: Apache License, Version 2.0
 Keywords: deltafi

{deltafi-2.0rc1724965202427 → deltafi-2.0rc1725634019389}/deltafi/domain.py

@@ -54,6 +54,7 @@ class Context(NamedTuple):
     joined_dids: List[str] = None
     memo: str = None
     logger: Logger = None
+    saved_content: List = []
 
     @classmethod
     def create(cls, context: dict, content_service: ContentService, logger: Logger):
@@ -121,6 +122,7 @@ class Context(NamedTuple):
                        joined_dids=joined_dids,
                        memo=memo,
                        content_service=content_service,
+                       saved_content=[],
                        logger=logger)
 
 

{deltafi-2.0rc1724965202427 → deltafi-2.0rc1725634019389}/deltafi/plugin.py

@@ -16,29 +16,30 @@
 #    limitations under the License.
 #
 
+import importlib
+import inspect
 import json
 import os
+import pkgutil
 import sys
 import threading
 import time
 import traceback
 from datetime import datetime, timezone, timedelta
+from importlib import metadata
 from os.path import isdir, isfile, join
 from pathlib import Path
 from typing import List
-import importlib
-import inspect
-import pkgutil
 
-from importlib import metadata
 import requests
+
+from deltafi.action import Action, Join
 from deltafi.actioneventqueue import ActionEventQueue
 from deltafi.domain import Event, ActionExecution
 from deltafi.exception import ExpectedContentException, MissingMetadataException
 from deltafi.logger import get_logger
 from deltafi.result import ErrorResult
 from deltafi.storage import ContentService
-from deltafi.action import Action, Join
 
 
 def _coordinates():
@@ -185,15 +186,15 @@ class Plugin(object):
         actions = [self._action_json(action) for action in self.actions]
 
         return {
-                'pluginCoordinates': self.coordinates.__json__(),
-                'displayName': self.display_name,
-                'description': self.description,
-                'actionKitVersion': metadata.version('deltafi'),
-                'dependencies': [],
-                'actions': actions,
-                'variables': variables,
-                'flowPlans': flows
-            }
+            'pluginCoordinates': self.coordinates.__json__(),
+            'displayName': self.display_name,
+            'description': self.description,
+            'actionKitVersion': metadata.version('deltafi'),
+            'dependencies': [],
+            'actions': actions,
+            'variables': variables,
+            'flowPlans': flows
+        }
 
     def _register(self):
         url = f"{self.core_url}/plugins"
@@ -256,6 +257,24 @@ class Plugin(object):
             finally:
                 time.sleep(10)
 
+    @staticmethod
+    def to_response(event, start_time, stop_time, result):
+        response = {
+            'did': event.context.did,
+            'flowName': event.context.flow_name,
+            'flowId': event.context.flow_id,
+            'actionName': event.context.action_name,
+            'actionId': event.context.action_id,
+            'start': start_time,
+            'stop': stop_time,
+            'type': result.result_type,
+            'metrics': [metric.json() for metric in result.metrics],
+            'savedContent': [content.json() for content in event.context.saved_content]
+        }
+        if result.result_key is not None:
+            response[result.result_key] = result.response()
+        return response
+
     def _do_action(self, action):
         action_logger = get_logger(self.action_name(action))
 
@@ -287,19 +306,8 @@ class Plugin(object):
 
                 action.action_execution = None
 
-                response = {
-                    'did': event.context.did,
-                    'flowName': event.context.flow_name,
-                    'flowId': event.context.flow_id,
-                    'actionName': event.context.action_name,
-                    'actionId': event.context.action_id,
-                    'start': start_time,
-                    'stop': time.time(),
-                    'type': result.result_type,
-                    'metrics': [metric.json() for metric in result.metrics]
-                }
-                if result.result_key is not None:
-                    response[result.result_key] = result.response()
+                response = Plugin.to_response(
+                    event, start_time, time.time(), result)
 
                 topic = 'dgs'
                 if event.return_address:

{deltafi-2.0rc1724965202427 → deltafi-2.0rc1725634019389}/deltafi/result.py

@@ -118,15 +118,17 @@ class IngressResultItem:
         return self
 
     def save_string_content(self, string_data: str, name: str, media_type: str):
-        segment = self.context.content_service.put_str(self.context.did, string_data)
-        self.content.append(
-            Content(name=name, segments=[segment], media_type=media_type, content_service=self.context.content_service))
+        segment = self.context.content_service.put_str(self._did, string_data)
+        c = Content(name=name, segments=[segment], media_type=media_type, content_service=self.context.content_service)
+        self.content.append(c)
+        self.context.saved_content.append(c)
         return self
 
     def save_byte_content(self, byte_data: bytes, name: str, media_type: str):
-        segment = self.context.content_service.put_bytes(self.context.did, byte_data)
-        self.content.append(
-            Content(name=name, segments=[segment], media_type=media_type, content_service=self.context.content_service))
+        segment = self.context.content_service.put_bytes(self._did, byte_data)
+        c = Content(name=name, segments=[segment], media_type=media_type, content_service=self.context.content_service)
+        self.content.append(c)
+        self.context.saved_content.append(c)
         return self
 
     def set_metadata(self, metadata: dict):
@@ -195,14 +197,16 @@ class TransformResult(Result):
 
     def save_string_content(self, string_data: str, name: str, media_type: str):
         segment = self.context.content_service.put_str(self.context.did, string_data)
-        self.content.append(
-            Content(name=name, segments=[segment], media_type=media_type, content_service=self.context.content_service))
+        c = Content(name=name, segments=[segment], media_type=media_type, content_service=self.context.content_service)
+        self.content.append(c)
+        self.context.saved_content.append(c)
         return self
 
     def save_byte_content(self, byte_data: bytes, name: str, media_type: str):
         segment = self.context.content_service.put_bytes(self.context.did, byte_data)
-        self.content.append(
-            Content(name=name, segments=[segment], media_type=media_type, content_service=self.context.content_service))
+        c = Content(name=name, segments=[segment], media_type=media_type, content_service=self.context.content_service)
+        self.content.append(c)
+        self.context.saved_content.append(c)
         return self
 
     def set_metadata(self, metadata: dict):

{deltafi-2.0rc1724965202427 → deltafi-2.0rc1725634019389}/deltafi/test_kit/framework.py

@@ -26,7 +26,6 @@ from deltafi.logger import get_logger
 from deltafi.metric import Metric
 from deltafi.result import ErrorResult, FilterResult
 from deltafi.storage import Segment
-
 from .assertions import *
 from .compare_helpers import GenericCompareHelper, CompareHelper
 from .constants import *
@@ -210,6 +209,7 @@ class ActionTest(ABC):
         self.loaded_inputs = []
         self.package_name = package_name
         self.res_path = ""
+        self.context = None
 
     def __reset__(self, did: str):
         self.content_service = InternalContentService()
@@ -219,6 +219,7 @@ class ActionTest(ABC):
             self.did = did
         self.loaded_inputs = []
         self.res_path = ""
+        self.context = None
 
     def load_file(self, ioc: IOContent):
         file_res = self.res_path.joinpath(ioc.file_name)
@@ -266,7 +267,7 @@ class ActionTest(ABC):
     def make_context(self, test_case: TestCaseBase):
         action_name = INGRESS_FLOW + "." + test_case.action.__class__.__name__
         join = {} if test_case.join_meta else None
-        return Context(
+        self.context = Context(
             did=self.did,
             delta_file_name=test_case.file_name,
             data_source="DATASRC",
@@ -278,8 +279,10 @@ class ActionTest(ABC):
             hostname=HOSTNAME,
             system_name=SYSTEM,
             content_service=self.content_service,
+            saved_content=[],
             join=join,
             logger=get_logger())
+        return self.context
 
     def make_event(self, test_case: TestCaseBase):
         return Event(delta_file_messages=self.make_df_msgs(test_case), context=self.make_context(test_case),
@@ -354,3 +357,7 @@ class ActionTest(ABC):
             assert_equal_len(expected_metrics, results)
             for index, expected in enumerate(expected_metrics):
                 self.compare_one_metric(expected, results[index])
+
+    def has_saved_content__size(self, count: int):
+        assert_equal_with_label(
+            count, len(self.context.saved_content), "savedContent")

{deltafi-2.0rc1724965202427 → deltafi-2.0rc1725634019389}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "deltafi"
-version = "2.0rc1724965202427"
+version = "2.0rc1725634019389"
 description = "SDK for DeltaFi plugins and actions"
 authors = ["DeltaFi <deltafi@systolic.com>"]
 license = "Apache License, Version 2.0"