deltafi 2.1.0__py3-none-any.whl → 2.2.0__py3-none-any.whl

deltafi/result.py

@@ -95,6 +95,7 @@ class IngressResultItem:
         self._did = str(uuid.uuid4())
         self.content = []
         self.metadata = {}
+        self.annotations = {}
         self.delta_file_name = delta_file_name
 
     @property
@@ -139,12 +140,17 @@ class IngressResultItem:
             segment_names.update(c.get_segment_names())
         return segment_names
 
+    def annotate(self, key: str, value: str):
+                    self.annotations[key] = value
+                    return self
+
     def response(self):
         return {
             'did': self._did,
             'deltaFileName': self.delta_file_name,
             'metadata': self.metadata,
-            'content': [content.json() for content in self.content]
+            'content': [content.json() for content in self.content],
+            'annotations': self.annotations
         }
 
 

deltafi/test_kit/assertions.py

@@ -29,10 +29,18 @@ def assert_equal_with_label(e, a, l):
     assert e == a, f"{l}. Expected:\n<<{e}>>\nBut was:\n<<{a}>>"
 
 
+def assert_equal_short(e, a, l):
+    assert e == a, f"{l}. E:{e}, A::{a}"
+
+
 def assert_equal_len(e, a):
     assert len(e) == len(a), f"{len(e)} != {len(a)}"
 
 
+def assert_equal_len_with_label(e, a, l):
+    assert len(e) == len(a), f"{l}. {len(e)} != {len(a)}"
+
+
 def assert_key_in(k, m):
     assert k in m, f"{k} not found"
 
@@ -45,4 +53,4 @@ def assert_keys_and_values(expected: Dict, actual: Dict):
     for key in expected:
         assert_key_in(key, actual)
         if expected[key] != IGNORE_VALUE:
-            assert_equal(expected[key], actual[key])
+            assert_equal_short(expected[key], actual[key], f"invalid value for key {key}")

deltafi/test_kit/framework.py

@@ -350,13 +350,13 @@ class ActionTest(ABC):
 
     @staticmethod
     def compare_one_metric(expected: Metric, result: Metric):
-        assert expected.name == result.name
-        assert_equal_with_label(expected.value, result.value, expected.name)
+        assert_equal_short(expected.name, result.name, "invalid metric name")
+        assert_equal_short(expected.value, result.value, f"invalid metric value for {expected.name}")
         assert_keys_and_values(expected.tags, result.tags)
 
     def compare_metrics(self, expected_metrics: List[Metric], results: List[Metric]):
         if len(expected_metrics) > 0:
-            assert_equal_len(expected_metrics, results)
+            assert_equal_len_with_label(expected_metrics, results, "invalid metrics count")
             for index, expected in enumerate(expected_metrics):
                 self.compare_one_metric(expected, results[index])
 

deltafi/test_kit/timed_ingress.py

@@ -19,7 +19,6 @@
 from typing import List
 
 from deltafi.result import IngressResult, IngressResultItem, IngressStatusEnum
-
 from .assertions import *
 from .framework import TestCaseBase, ActionTest, IOContent
 
@@ -44,12 +43,15 @@ class TimedIngressTestCase(TestCaseBase):
         self.status = status
         self.status_message = status_message
 
-    def add_ingress_result_item(self, content: List[IOContent], metadata: Dict, name: str = None):
+    def add_ingress_result_item(self, content: List[IOContent], metadata: Dict, name: str = None, annotations: Dict = None):
+        if annotations is None:
+            annotations = {}
         self.results.append(
             {
                 'content': content,
                 'metadata': metadata,
-                'name': name
+                'name': name,
+                'annotations': annotations
             }
         )
 
@@ -74,12 +76,12 @@ class TimedIngressActionTest(ActionTest):
         self.assert_ingress_result(test_case, result)
 
     def assert_ingress_result(self, test_case: TimedIngressTestCase, result: IngressResult):
-        assert_equal(test_case.memo, result.memo)
-        assert_equal(test_case.execute_immediate, result.execute_immediate)
-        assert_equal(test_case.status, result.status)
-        assert_equal(test_case.status_message, result.status_message)
+        assert_equal_short(test_case.memo, result.memo, "invalid memo")
+        assert_equal_short(test_case.execute_immediate, result.execute_immediate, "invalid execute_immediate")
+        assert_equal_short(test_case.status, result.status, "invalid status")
+        assert_equal_with_label(test_case.status_message, result.status_message, "invalid status_message")
 
-        assert_equal_len(test_case.results, result.ingress_result_items)
+        assert_equal_len_with_label(test_case.results, result.ingress_result_items, "item count mismatch")
         for index, ingress_item in enumerate(result.ingress_result_items):
             self.compare_one_ingress_item(test_case, ingress_item, index)
             expected = test_case.results[index]
@@ -94,3 +96,6 @@ class TimedIngressActionTest(ActionTest):
 
         # Check metadata
         assert_keys_and_values(expected['metadata'], result.metadata)
+
+        # Check annotations
+        assert_keys_and_values(expected['annotations'], result.annotations)

deltafi/test_kit/transform.py

@@ -19,7 +19,6 @@
 from typing import List
 
 from deltafi.result import TransformResult, TransformResults
-
 from .assertions import *
 from .framework import TestCaseBase, ActionTest, IOContent
 
@@ -74,7 +73,7 @@ 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.child_results)
+        assert_equal_len_with_label(test_case.results, result.child_results, "invalid child count")
         for index, child_result in enumerate(result.child_results):
             self.compare_one_transform_result(test_case, child_result, index)
             expected = test_case.results[index]

{deltafi-2.1.0.dist-info → deltafi-2.2.0.dist-info}/METADATA

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

{deltafi-2.1.0.dist-info → deltafi-2.2.0.dist-info}/RECORD

@@ -9,16 +9,16 @@ 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=QQ197MWyi3dCkax6rjA-kylbfMrMWHEaG8jIVsOGRW4,17980
-deltafi/result.py,sha256=2mefttQAdvYhsw6IjvouY4L5W1n3s6tP7oJUhLtyyVk,9047
+deltafi/result.py,sha256=whI8XlNuuHroYdA_dvZ2z1yIg_Z3wcuP_60DF8-HW9o,9251
 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
+deltafi/test_kit/assertions.py,sha256=QKmAqMfDgrk9usBMy_dhFdp-4o_Rwx3DtVEbB7Ksnyg,1594
 deltafi/test_kit/compare_helpers.py,sha256=qRINvCQqBUaalT1DG2oz2egSkUjiSOfqKF5U7WyeT_g,12957
 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=6txr5vnLSFIDaXgx-cXjDuYJSPcSHR7ez1x4N8TsNNw,15337
-deltafi/test_kit/timed_ingress.py,sha256=ztE57hCuoZTrtFn_HlyHpHMFJN5Oyo3pPhVfbAI_weM,3790
-deltafi/test_kit/transform.py,sha256=Qj9LIyZ8RYj0tCeq7agrDlEkkgtBR86TNinV9oncTnM,4089
-deltafi-2.1.0.dist-info/METADATA,sha256=3NnbYSKHSIZx_m3Gh9wRBQyy3v0wzNV_QHnE5tQlCMs,1517
-deltafi-2.1.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-deltafi-2.1.0.dist-info/RECORD,,
+deltafi/test_kit/framework.py,sha256=BhEQmIDCqofl_smjsRoki8m2L56AK6QHmrNyjyFM-so,15432
+deltafi/test_kit/timed_ingress.py,sha256=fYKafV8w2mXOpXkpsDFXYVFjB3_sc2Y7Gfx62EUHJ5E,4177
+deltafi/test_kit/transform.py,sha256=GP495pQaUTcdQJ4FLQ02ndxZ0PbdYHk3US522kP6CwY,4122
+deltafi-2.2.0.dist-info/METADATA,sha256=iRyN319SF750mE_4u5s0GaD1CRdi_bXkMm-AissR35o,1517
+deltafi-2.2.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+deltafi-2.2.0.dist-info/RECORD,,