deltafi 2.0rc1730159244116__py3-none-any.whl → 2.0rc1731040010625__py3-none-any.whl

deltafi/domain.py

@@ -20,6 +20,7 @@ import copy
 from datetime import datetime, timedelta, timezone
 from logging import Logger
 from typing import Dict, List, NamedTuple
+from uuid import uuid4
 
 from deltafi.storage import ContentService, Segment
 
@@ -119,6 +120,9 @@ class Context(NamedTuple):
                        saved_content=[],
                        logger=logger)
 
+    def child_context(self):
+        return self._replace(did=str(uuid4()))
+
 
 class Content:
     """

deltafi/plugin.py

@@ -25,6 +25,7 @@ import sys
 import threading
 import time
 import traceback
+import yaml
 from datetime import datetime, timezone, timedelta
 from importlib import metadata
 from os.path import isdir, isfile, join
@@ -182,6 +183,18 @@ class Plugin(object):
             'docsMarkdown': self._load_action_docs(action)
         }
 
+    def _integration_tests(self):
+        tests_path = str(Path(os.path.dirname(os.path.abspath(sys.argv[0]))) / 'integration')
+
+        test_files = []
+        if isdir(tests_path):
+            test_files = [f for f in os.listdir(tests_path) if isfile(join(tests_path, f))]
+        else:
+            self.logger.warning(f"tests directory ({tests_path}) does not exist. No tests will be installed.")
+
+        tests = [json.load(open(join(tests_path, f))) for f in test_files]
+        return tests
+
     def registration_json(self):
         flows_path = str(Path(os.path.dirname(os.path.abspath(sys.argv[0]))) / 'flows')
 
@@ -208,7 +221,8 @@ class Plugin(object):
             'dependencies': [],
             'actions': actions,
             'variables': variables,
-            'flowPlans': flows
+            'flowPlans': flows,
+            'integrationTests': self._integration_tests()
         }
 
     def _register(self):

deltafi/result.py

@@ -239,6 +239,7 @@ class TransformResult(Result):
 
     def json(self):
         return {
+            'did': self.context.did,
             'content': [content.json() for content in self.content],
             'annotations': self.annotations,
             'metadata': self.metadata,
@@ -249,38 +250,38 @@ class TransformResult(Result):
         return [self.json()]
 
 
-class NamedTransformResult(NamedTuple):
-    result: TransformResult
-    name: str
+class ChildTransformResult(TransformResult):
+    delta_file_name: str
 
-    def get_segment_names(self):
-        return self.result.get_segment_names()
+    def __init__(self, context: Context, delta_file_name: str = None):
+        super().__init__(context.child_context())
+        self.delta_file_name = delta_file_name
 
     def json(self):
-        j = self.result.json()
-        if self.name is not None:
-            j['name'] = self.name
+        j = super().json()
+        if self.delta_file_name is not None:
+            j['name'] = self.delta_file_name
         return j
 
 
 class TransformResults(Result):
     def __init__(self, context: Context):
         super().__init__('transform', 'TRANSFORM', context)
-        self.named_results = []
+        self.child_results = []
 
-    def add_result(self, result: TransformResult, name: str = None):
-        self.named_results.append(NamedTransformResult(result, name))
+    def add_result(self, result: ChildTransformResult):
+        self.child_results.append(result)
         return self
 
     def get_segment_names(self):
         segment_names = {}
-        for named_result in self.named_results:
-            segment_names.update(named_result.get_segment_names())
+        for child_result in self.child_results:
+            segment_names.update(child_result.get_segment_names())
         return segment_names
 
     def response(self):
         transform_events = []
-        for named_result in self.named_results:
-            json_dict = named_result.json()
+        for child_result in self.child_results:
+            json_dict = child_result.json()
             transform_events.append(json_dict)
         return transform_events

deltafi/test_kit/transform.py

@@ -74,12 +74,12 @@ class TransformActionTest(ActionTest):
         self.assert_transform_results(test_case, result)
 
     def assert_transform_results(self, test_case: TransformTestCase, result: TransformResults):
-        assert_equal_len(test_case.results, result.named_results)
-        for index, named_result in enumerate(result.named_results):
-            self.compare_one_transform_result(test_case, named_result.result, index)
+        assert_equal_len(test_case.results, result.child_results)
+        for index, child_result in enumerate(result.child_results):
+            self.compare_one_transform_result(test_case, child_result, index)
             expected = test_case.results[index]
             if 'name' in expected:
-                assert_equal_with_label(expected["name"], named_result.name, f"name[{index}]")
+                assert_equal_with_label(expected["name"], child_result.delta_file_name, f"name[{index}]")
 
     def assert_transform_result(self, test_case: TransformTestCase, result: TransformResult):
         # Check metrics

{deltafi-2.0rc1730159244116.dist-info → deltafi-2.0rc1731040010625.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deltafi
-Version: 2.0rc1730159244116
+Version: 2.0rc1731040010625
 Summary: SDK for DeltaFi plugins and actions
 License: Apache License, Version 2.0
 Keywords: deltafi
@@ -19,13 +19,14 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development
+Requires-Dist: PyYAML (==6.0.2)
 Requires-Dist: deepdiff (==6.7.1)
 Requires-Dist: json-logging (==1.3.0)
-Requires-Dist: minio (==7.2.7)
-Requires-Dist: pydantic (==2.8.2)
-Requires-Dist: redis (==5.0.7)
+Requires-Dist: minio (==7.2.10)
+Requires-Dist: pydantic (==2.9.2)
+Requires-Dist: redis (==5.2.0)
 Requires-Dist: requests (==2.32.3)
-Requires-Dist: urllib3 (==2.2.2)
+Requires-Dist: urllib3 (==2.2.3)
 Project-URL: Bug Reports, https://chat.deltafi.org/deltafi/channels/bug-reports
 Project-URL: Documentation, https://docs.deltafi.org/#/
 Project-URL: Source Code, https://gitlab.com/deltafi/deltafi

{deltafi-2.0rc1730159244116.dist-info → deltafi-2.0rc1731040010625.dist-info}/RECORD

@@ -2,14 +2,14 @@ deltafi/__init__.py,sha256=sSGWjpvzcCzgLywoEg55z_0satt0g_LPTwNIWtylgF4,709
 deltafi/action.py,sha256=kuDY7-qcJsiRTB3ZigiYg-XOcNeahnDU3NGSZBy10vM,5753
 deltafi/actioneventqueue.py,sha256=_05aDeqVpUbGWG3jFf0AalOsVfAvOTn0oBxjpQIQxIs,2847
 deltafi/actiontype.py,sha256=CpVI0wk9C-eu44e0jYvqBzE6yIX_zfRrW5RCf4ohu4Y,913
-deltafi/domain.py,sha256=YIfkxnjIuDXRlEm0MvrKh0CY5KczTZqZiTmnhc7wkOo,12082
+deltafi/domain.py,sha256=wCWqCjWbQ02thAMHYXTuUMHY58QZyyTRkYNZFd3kPPo,12182
 deltafi/exception.py,sha256=LNNFqc_lA89I-RvnVsbTQ2vnWQ9WZXdQqLwiXwNgc_w,943
 deltafi/genericmodel.py,sha256=WU8zfqEO_n84CZ0KpH9FhgTsL9jyU0EXSuhL0IdLWFw,1152
 deltafi/input.py,sha256=ydAhuw68N9qMeacc9YE4U79zRqxWiinZNkm1AxoFBEk,1656
 deltafi/logger.py,sha256=mKfJTnuupf3sto6hV-SIXajtcP-xTSSdJ2Ufd-lJPTo,2140
 deltafi/metric.py,sha256=79Gb2C1qYXeQYshgFPu2BcMT5oEb0LhmNfwyulSqsIc,972
-deltafi/plugin.py,sha256=FzzUEahdpWzGCULf7qhkfBsxZg4YgHGthq2wg0d2Ajc,14952
-deltafi/result.py,sha256=Xv156aM-PgYNB1Y6L-0Wl22YMj46srt88aAXtgc0U74,8957
+deltafi/plugin.py,sha256=7e4wblHAG41UCOZ1RcWjkw-0RJF4_dAksx5b4XCNIU4,15521
+deltafi/result.py,sha256=2mefttQAdvYhsw6IjvouY4L5W1n3s6tP7oJUhLtyyVk,9047
 deltafi/storage.py,sha256=vCE29Yzk5s7ub4O1PdaxXBKPBQy4OHs7j46z3O5MezE,2979
 deltafi/test_kit/__init__.py,sha256=sSGWjpvzcCzgLywoEg55z_0satt0g_LPTwNIWtylgF4,709
 deltafi/test_kit/assertions.py,sha256=MdUXENLn0aDvknMtsnSAb-DwvpzXlMkaYQ6-RRkWG8s,1378
@@ -17,7 +17,7 @@ deltafi/test_kit/compare_helpers.py,sha256=qRINvCQqBUaalT1DG2oz2egSkUjiSOfqKF5U7
 deltafi/test_kit/constants.py,sha256=Suygx9CEob2Skw4UyzzMCibQ8hRhGHC_d_Xab8AJMFE,833
 deltafi/test_kit/egress.py,sha256=53SBeJJmphDl-jZdqkC1dKYWZ4ATWlzY02TUt0Sj1zs,1899
 deltafi/test_kit/framework.py,sha256=g7NRl_KxUFio8aZ1xo1gEBKqL9qquYx9qAyFpPLHsmM,15150
-deltafi/test_kit/transform.py,sha256=bnV6kcOkuShi_9uCtzkWcgz-wMejnI9Q2_MbyVm_A7U,4085
-deltafi-2.0rc1730159244116.dist-info/METADATA,sha256=lAnrDTockN0RxsLsAZjbkMCicQ85-vZRfAnV9jFBpuA,1497
-deltafi-2.0rc1730159244116.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-deltafi-2.0rc1730159244116.dist-info/RECORD,,
+deltafi/test_kit/transform.py,sha256=Qj9LIyZ8RYj0tCeq7agrDlEkkgtBR86TNinV9oncTnM,4089
+deltafi-2.0rc1731040010625.dist-info/METADATA,sha256=515J328ll7iZ6v_RfUpNTeOCPkK242WEYZjzekh63FE,1530
+deltafi-2.0rc1731040010625.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+deltafi-2.0rc1731040010625.dist-info/RECORD,,