deltafi 2.0rc1728671284198__tar.gz → 2.0rc1729598262285__tar.gz

{deltafi-2.0rc1728671284198 → deltafi-2.0rc1729598262285}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deltafi
-Version: 2.0rc1728671284198
+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.0rc1728671284198 → deltafi-2.0rc1729598262285}/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-2.0rc1728671284198 → deltafi-2.0rc1729598262285}/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-2.0rc1728671284198 → deltafi-2.0rc1729598262285}/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-2.0rc1728671284198 → deltafi-2.0rc1729598262285}/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-2.0rc1728671284198 → deltafi-2.0rc1729598262285}/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-2.0rc1728671284198 → deltafi-2.0rc1729598262285}/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.0rc1728671284198 → deltafi-2.0rc1729598262285}/pyproject.toml

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