deltafi 2.0rc1728351490278__py3-none-any.whl → 2.0rc1729598262285__py3-none-any.whl

deltafi/action.py

@@ -130,7 +130,7 @@ class TransformAction(Action, ABC):
         return TransformInput(content=delta_file_message.content_list, metadata=delta_file_message.metadata)
 
     def execute_join_action(self, event):
-        if (isinstance(self, Join)):
+        if isinstance(self, Join):
             return self.execute(
                 event.context,
                 self.join([self.build_input(event.context, delta_file_message)

deltafi/domain.py

@@ -45,7 +45,6 @@ class Context(NamedTuple):
     flow_name: str
     flow_id: str
     action_name: str
-    action_id: str
     action_version: str
     hostname: str
     system_name: str
@@ -79,10 +78,6 @@ class Context(NamedTuple):
             action_name = context['actionName']
         else:
             action_name = None
-        if 'actionId' in context:
-            action_id = context['actionId']
-        else:
-            action_id = None
         if 'actionVersion' in context:
             action_version = context['actionVersion']
         else:
@@ -114,7 +109,6 @@ class Context(NamedTuple):
                        flow_name=flow_name,
                        flow_id=flow_id,
                        action_name=action_name,
-                       action_id=action_id,
                        action_version=action_version,
                        hostname=hostname,
                        system_name=system_name,

deltafi/logger.py

@@ -25,7 +25,7 @@ import json_logging
 
 def get_logger(name: str = None) -> logging.Logger:
     logger = logging.getLogger(name)
-    logger.setLevel(logging.DEBUG)
+    logger.setLevel(logging.INFO)
     logger.addHandler(logging.StreamHandler(sys.stdout))
     logger.propagate = False
 

deltafi/metric.py

@@ -22,7 +22,7 @@ from typing import Dict, NamedTuple
 class Metric(NamedTuple):
     name: str
     value: int
-    tags: Dict[str, str]
+    tags: Dict[str, str] = {}
 
     def json(self):
         return {

deltafi/plugin.py

@@ -159,13 +159,25 @@ class Plugin(object):
     def action_name(self, action):
         return f"{self.coordinates.group_id}.{action.__class__.__name__}"
 
+    def _load_action_docs(self, action):
+        docs_path = str(Path(os.path.dirname(os.path.abspath(sys.argv[0]))) / 'docs')
+        if not isdir(docs_path):
+            return None
+
+        action_docs_file = join(docs_path, action.__class__.__name__ + '.md')
+        if not isfile(action_docs_file):
+            return None
+
+        return open(action_docs_file).read()
+
     def _action_json(self, action):
         return {
             'name': self.action_name(action),
             'description': action.description,
             'type': action.action_type.name,
             'supportsJoin': isinstance(action, Join),
-            'schema': action.param_class().model_json_schema()
+            'schema': action.param_class().model_json_schema(),
+            'docsMarkdown': self._load_action_docs(action)
         }
 
     def registration_json(self):
@@ -263,7 +275,6 @@ class Plugin(object):
             '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,

deltafi/result.py

@@ -24,7 +24,6 @@ from typing import NamedTuple
 from deltafi.domain import Content, Context
 from deltafi.metric import Metric
 
-ENDPOINT_TAG = "endpoint"
 FILES_OUT = "files_out"
 BYTES_OUT = "bytes_out"
 
@@ -48,10 +47,10 @@ class Result:
 
 
 class EgressResult(Result):
-    def __init__(self, context: Context, destination: str, bytes_egressed: int):
+    def __init__(self, context: Context, bytes_egressed: int):
         super().__init__(None, 'EGRESS', context)
-        self.add_metric(Metric(FILES_OUT, 1, {ENDPOINT_TAG: destination}))
-        self.add_metric(Metric(BYTES_OUT, bytes_egressed, {ENDPOINT_TAG: destination}))
+        self.add_metric(Metric(FILES_OUT, 1))
+        self.add_metric(Metric(BYTES_OUT, bytes_egressed))
 
     def response(self):
         return None

deltafi/test_kit/framework.py

@@ -274,7 +274,6 @@ class ActionTest(ABC):
             flow_name=INGRESS_FLOW,
             flow_id="FLOWID",
             action_name=action_name,
-            action_id="ACTIONID",
             action_version="1.0",
             hostname=HOSTNAME,
             system_name=SYSTEM,

{deltafi-2.0rc1728351490278.dist-info → deltafi-2.0rc1729598262285.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deltafi
-Version: 2.0rc1728351490278
+Version: 2.0rc1729598262285
 Summary: SDK for DeltaFi plugins and actions
 License: Apache License, Version 2.0
 Keywords: deltafi
@@ -17,6 +17,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development
 Requires-Dist: deepdiff (==6.7.1)
 Requires-Dist: json-logging (==1.3.0)

{deltafi-2.0rc1728351490278.dist-info → deltafi-2.0rc1729598262285.dist-info}/RECORD

@@ -1,23 +1,23 @@
 deltafi/__init__.py,sha256=sSGWjpvzcCzgLywoEg55z_0satt0g_LPTwNIWtylgF4,709
-deltafi/action.py,sha256=Myc4RTYHLag6hXYd1pHZl3aguDPTrJ0MWN8x9nWG4Sw,5755
+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=1nUjpOF48UlytGKHep-lAy06U9RIe0H_dSeDJMsajng,12266
+deltafi/domain.py,sha256=YIfkxnjIuDXRlEm0MvrKh0CY5KczTZqZiTmnhc7wkOo,12082
 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=4ahVx6E3TIZBTcvteaBeYXeAjk1oRR7vHkOienmtx4U,2141
-deltafi/metric.py,sha256=s68b1xNG9UPcpOB-nlTT-SntskJEUCpoKz1gTMRFgHc,967
-deltafi/plugin.py,sha256=20uXIB3XhaQAefBwKV-Mh7s4-sx9iWm9A_xLXbermeU,14374
-deltafi/result.py,sha256=s5jIoCa_deYHyl0T3lXLOcEVTROE2_U_7AQ2n4USgdI,9234
+deltafi/logger.py,sha256=mKfJTnuupf3sto6hV-SIXajtcP-xTSSdJ2Ufd-lJPTo,2140
+deltafi/metric.py,sha256=79Gb2C1qYXeQYshgFPu2BcMT5oEb0LhmNfwyulSqsIc,972
+deltafi/plugin.py,sha256=O0AC5678EnrRN2tOhcVa4rGvPDn3wxiV22rrecJgDqc,14760
+deltafi/result.py,sha256=ySLByhz3eF_P17-puQnzQtcISAVXpyMnhyWxBRjhJ1g,9132
 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/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=w0vdG3sTGYFrd1cQN6r4H5ioXhjRfABJBGs6ZbNBEo0,15184
+deltafi/test_kit/framework.py,sha256=g7NRl_KxUFio8aZ1xo1gEBKqL9qquYx9qAyFpPLHsmM,15150
 deltafi/test_kit/transform.py,sha256=bnV6kcOkuShi_9uCtzkWcgz-wMejnI9Q2_MbyVm_A7U,4085
-deltafi-2.0rc1728351490278.dist-info/METADATA,sha256=H2x29SF6u5NdJjaV5VHv_5BH97h9lsoPh4Fz5SvE9eI,1446
-deltafi-2.0rc1728351490278.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-deltafi-2.0rc1728351490278.dist-info/RECORD,,
+deltafi-2.0rc1729598262285.dist-info/METADATA,sha256=w6ol87H_w_eqseMb9OK7a92S-73gzwPLNS8pouL_7_4,1497
+deltafi-2.0rc1729598262285.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+deltafi-2.0rc1729598262285.dist-info/RECORD,,

{deltafi-2.0rc1728351490278.dist-info → deltafi-2.0rc1729598262285.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.0
+Generator: poetry-core 1.9.1
 Root-Is-Purelib: true
 Tag: py3-none-any