dotflow 0.16.0.dev3__py3-none-any.whl → 0.16.0.dev4__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- dotflow/__init__.py +1 -1
- dotflow/cli/commands/start.py +3 -28
- dotflow/providers/__init__.py +0 -2
- dotflow/providers/server_default.py +99 -6
- {dotflow-0.16.0.dev3.dist-info → dotflow-0.16.0.dev4.dist-info}/METADATA +1 -1
- {dotflow-0.16.0.dev3.dist-info → dotflow-0.16.0.dev4.dist-info}/RECORD +9 -10
- dotflow/providers/server_api.py +0 -89
- {dotflow-0.16.0.dev3.dist-info → dotflow-0.16.0.dev4.dist-info}/WHEEL +0 -0
- {dotflow-0.16.0.dev3.dist-info → dotflow-0.16.0.dev4.dist-info}/entry_points.txt +0 -0
- {dotflow-0.16.0.dev3.dist-info → dotflow-0.16.0.dev4.dist-info}/licenses/LICENSE +0 -0
dotflow/__init__.py
CHANGED
dotflow/cli/commands/start.py
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
"""Command start module"""
|
|
2
2
|
|
|
3
|
-
import os
|
|
4
3
|
from os import system
|
|
5
4
|
|
|
6
5
|
from dotflow import Config, DotFlow
|
|
@@ -9,8 +8,6 @@ from dotflow.core.exception import InvalidWorkflowFactory, WorkflowFlagConflict
|
|
|
9
8
|
from dotflow.core.module import Module
|
|
10
9
|
from dotflow.core.types.execution import TypeExecution
|
|
11
10
|
from dotflow.providers import (
|
|
12
|
-
ServerAPI,
|
|
13
|
-
ServerDefault,
|
|
14
11
|
StorageDefault,
|
|
15
12
|
StorageFile,
|
|
16
13
|
StorageGCS,
|
|
@@ -62,32 +59,10 @@ class StartCommand(Command):
|
|
|
62
59
|
result.start(mode=self.params.mode)
|
|
63
60
|
|
|
64
61
|
def _new_workflow(self):
|
|
65
|
-
config = self._build_config()
|
|
66
|
-
workflow_id = os.getenv("WORKFLOW_ID")
|
|
67
|
-
|
|
68
|
-
if config is None:
|
|
69
|
-
return DotFlow(workflow_id=workflow_id)
|
|
70
|
-
return DotFlow(config=config, workflow_id=workflow_id)
|
|
71
|
-
|
|
72
|
-
def _build_config(self):
|
|
73
62
|
storage = self._build_storage()
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
return None
|
|
78
|
-
|
|
79
|
-
return Config(
|
|
80
|
-
storage=storage or StorageDefault(),
|
|
81
|
-
server=server or ServerDefault(),
|
|
82
|
-
)
|
|
83
|
-
|
|
84
|
-
def _build_server(self):
|
|
85
|
-
base_url = os.getenv("SERVER_BASE_URL")
|
|
86
|
-
user_token = os.getenv("SERVER_USER_TOKEN")
|
|
87
|
-
|
|
88
|
-
if not base_url or not user_token:
|
|
89
|
-
return None
|
|
90
|
-
return ServerAPI(base_url=base_url, user_token=user_token)
|
|
63
|
+
if storage is None:
|
|
64
|
+
return DotFlow()
|
|
65
|
+
return DotFlow(config=Config(storage=storage))
|
|
91
66
|
|
|
92
67
|
def _build_storage(self):
|
|
93
68
|
if not self.params.storage:
|
dotflow/providers/__init__.py
CHANGED
|
@@ -6,7 +6,6 @@ from dotflow.providers.notify_default import NotifyDefault
|
|
|
6
6
|
from dotflow.providers.notify_discord import NotifyDiscord
|
|
7
7
|
from dotflow.providers.notify_telegram import NotifyTelegram
|
|
8
8
|
from dotflow.providers.scheduler_default import SchedulerDefault
|
|
9
|
-
from dotflow.providers.server_api import ServerAPI
|
|
10
9
|
from dotflow.providers.server_default import ServerDefault
|
|
11
10
|
from dotflow.providers.storage_default import StorageDefault
|
|
12
11
|
from dotflow.providers.storage_file import StorageFile
|
|
@@ -21,7 +20,6 @@ __all__ = [
|
|
|
21
20
|
"NotifyTelegram",
|
|
22
21
|
"SchedulerCron",
|
|
23
22
|
"SchedulerDefault",
|
|
24
|
-
"ServerAPI",
|
|
25
23
|
"ServerDefault",
|
|
26
24
|
"StorageDefault",
|
|
27
25
|
"StorageFile",
|
|
@@ -1,23 +1,116 @@
|
|
|
1
|
-
"""ServerDefault — no-op server provider."""
|
|
1
|
+
"""ServerDefault — no-op or managed HTTP server provider."""
|
|
2
2
|
|
|
3
3
|
from __future__ import annotations
|
|
4
4
|
|
|
5
|
+
import os
|
|
6
|
+
from functools import wraps
|
|
5
7
|
from typing import Any
|
|
6
8
|
|
|
9
|
+
from requests import patch, post
|
|
10
|
+
from requests.exceptions import RequestException
|
|
11
|
+
|
|
7
12
|
from dotflow.abc.server import Server
|
|
13
|
+
from dotflow.logging import logger
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
def managed(method):
|
|
17
|
+
@wraps(method)
|
|
18
|
+
def wrapper(self, *args, **kwargs):
|
|
19
|
+
if not self._managed:
|
|
20
|
+
return
|
|
21
|
+
return method(self, *args, **kwargs)
|
|
22
|
+
|
|
23
|
+
return wrapper
|
|
8
24
|
|
|
9
25
|
|
|
10
26
|
class ServerDefault(Server):
|
|
11
|
-
"""Default Server
|
|
27
|
+
"""Default Server provider with auto-detected managed mode.
|
|
28
|
+
|
|
29
|
+
When ``SERVER_BASE_URL`` and ``SERVER_USER_TOKEN`` env vars are set,
|
|
30
|
+
sends workflow and task events to the remote API. Otherwise, all
|
|
31
|
+
methods are no-ops.
|
|
32
|
+
"""
|
|
33
|
+
|
|
34
|
+
MAX_RESULT_SIZE = 5_000_000
|
|
35
|
+
TIMEOUT = 15.0
|
|
36
|
+
|
|
37
|
+
ENDPOINT_WORKFLOWS = "/workflows"
|
|
38
|
+
ENDPOINT_WORKFLOW = "/workflows/{workflow_id}"
|
|
39
|
+
ENDPOINT_TASKS = "/workflows/{workflow_id}/tasks"
|
|
40
|
+
ENDPOINT_TASK = "/workflows/{workflow_id}/tasks/{task_id}"
|
|
41
|
+
|
|
42
|
+
def __init__(self) -> None:
|
|
43
|
+
base_url = os.getenv("SERVER_BASE_URL")
|
|
44
|
+
user_token = os.getenv("SERVER_USER_TOKEN")
|
|
45
|
+
self._managed = bool(base_url and user_token)
|
|
46
|
+
|
|
47
|
+
self._base_url = base_url.rstrip("/") if base_url else None
|
|
48
|
+
self._user_token = user_token
|
|
49
|
+
|
|
50
|
+
@property
|
|
51
|
+
def _headers(self) -> dict:
|
|
52
|
+
return {
|
|
53
|
+
"Authorization": f"Bearer {self._user_token}",
|
|
54
|
+
"Content-Type": "application/json",
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
def _post(self, url: str, json: dict) -> None:
|
|
58
|
+
try:
|
|
59
|
+
response = post(
|
|
60
|
+
url,
|
|
61
|
+
json=json,
|
|
62
|
+
headers=self._headers,
|
|
63
|
+
timeout=self.TIMEOUT,
|
|
64
|
+
)
|
|
65
|
+
logger.info("POST %s [%s]", url, response.status_code)
|
|
66
|
+
except RequestException as error:
|
|
67
|
+
logger.error("POST %s failed: %s", url, error)
|
|
68
|
+
|
|
69
|
+
def _patch(self, url: str, json: dict) -> None:
|
|
70
|
+
try:
|
|
71
|
+
response = patch(
|
|
72
|
+
url,
|
|
73
|
+
json=json,
|
|
74
|
+
headers=self._headers,
|
|
75
|
+
timeout=self.TIMEOUT,
|
|
76
|
+
)
|
|
77
|
+
logger.info("PATCH %s [%s]", url, response.status_code)
|
|
78
|
+
except RequestException as error:
|
|
79
|
+
logger.error("PATCH %s failed: %s", url, error)
|
|
12
80
|
|
|
81
|
+
@managed
|
|
13
82
|
def create_workflow(self, workflow: Any) -> None:
|
|
14
|
-
|
|
83
|
+
self._post(
|
|
84
|
+
self._base_url + self.ENDPOINT_WORKFLOWS,
|
|
85
|
+
json={"id": str(workflow)},
|
|
86
|
+
)
|
|
15
87
|
|
|
88
|
+
@managed
|
|
16
89
|
def update_workflow(self, workflow: Any, status: str = "") -> None:
|
|
17
|
-
|
|
90
|
+
self._patch(
|
|
91
|
+
self._base_url
|
|
92
|
+
+ self.ENDPOINT_WORKFLOW.format(workflow_id=workflow),
|
|
93
|
+
json={"status": status},
|
|
94
|
+
)
|
|
18
95
|
|
|
96
|
+
@managed
|
|
19
97
|
def create_task(self, task: Any) -> None:
|
|
20
|
-
|
|
98
|
+
data = task.result(max=self.MAX_RESULT_SIZE)
|
|
99
|
+
data["id"] = data.pop("task_id", task.task_id)
|
|
100
|
+
self._post(
|
|
101
|
+
self._base_url
|
|
102
|
+
+ self.ENDPOINT_TASKS.format(workflow_id=task.workflow_id),
|
|
103
|
+
json=data,
|
|
104
|
+
)
|
|
21
105
|
|
|
106
|
+
@managed
|
|
22
107
|
def update_task(self, task: Any) -> None:
|
|
23
|
-
|
|
108
|
+
data = task.result(max=self.MAX_RESULT_SIZE)
|
|
109
|
+
self._patch(
|
|
110
|
+
self._base_url
|
|
111
|
+
+ self.ENDPOINT_TASK.format(
|
|
112
|
+
workflow_id=task.workflow_id,
|
|
113
|
+
task_id=task.task_id,
|
|
114
|
+
),
|
|
115
|
+
json=data,
|
|
116
|
+
)
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: dotflow
|
|
3
|
-
Version: 0.16.0.
|
|
3
|
+
Version: 0.16.0.dev4
|
|
4
4
|
Summary: 🎲 Dotflow turns an idea into flow! Lightweight Python library for execution pipelines with retry, parallel, cron and async support.
|
|
5
5
|
License: Apache License
|
|
6
6
|
Version 2.0, January 2004
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
dotflow/__init__.py,sha256=
|
|
1
|
+
dotflow/__init__.py,sha256=wJ-Qvt1kMdT5G76fioVTPUDK8qzEP8Grr19h3kdQEAA,351
|
|
2
2
|
dotflow/abc/__init__.py,sha256=UIk84jCJYoHAk4In_eVXAaFAnNE63lI3dVP5qunyBJs,32
|
|
3
3
|
dotflow/abc/file.py,sha256=QEDIS-AXaW3GK5q5ckhNdoC5A3p8oOFE7VyNGSvx540,296
|
|
4
4
|
dotflow/abc/flow.py,sha256=j6m9u13UXgBCIhgrUwzvBBYHTDul_DfERD4DWA1BQBw,1436
|
|
@@ -19,7 +19,7 @@ dotflow/cli/commands/deploy.py,sha256=qUeZx-C00OfOEMURNZ4LMRI4qYOwwDS_ajOGtLa_Wb
|
|
|
19
19
|
dotflow/cli/commands/init.py,sha256=VySDg1gNx_8jH0vfhc15BhBJR3Yckw91v26ijyGz5Pw,387
|
|
20
20
|
dotflow/cli/commands/log.py,sha256=AJmDQM1ulbQg7_wZRsx3xac_7_6WlP8eA4pBWhpNBTo,590
|
|
21
21
|
dotflow/cli/commands/schedule.py,sha256=C9wvgSowV4xgQqrx6pjNZk5-709uNDfsA7xGBjjbZYA,1442
|
|
22
|
-
dotflow/cli/commands/start.py,sha256=
|
|
22
|
+
dotflow/cli/commands/start.py,sha256=FBtuSY5KKuNWbqxppKVG-QrSc5fLbqtwrRELgGk7c9g,2425
|
|
23
23
|
dotflow/cli/commands/storage.py,sha256=b3CMBSFGEqYxaI9gwiO90MIirnW82CcM3GUf4XJGVYs,1549
|
|
24
24
|
dotflow/cli/setup.py,sha256=MDt_yNOdyDIhQHQfrWjXCvvnO5i0Ul-fwa7Dag2F6h0,8094
|
|
25
25
|
dotflow/cli/validators/__init__.py,sha256=JKD-C4igDghgLjU2eBbpHkThUapoJ2mJRtC_YkeEvHg,121
|
|
@@ -85,7 +85,7 @@ dotflow/core/types/workflow.py,sha256=Obc3SpXCFW-ZDxPAirdYVK7W21G_j8WYY6e0nwYIk6
|
|
|
85
85
|
dotflow/core/workflow.py,sha256=d16JEi33I8kw9cju5Tt7v7-GIfu2HKNkhTFfY-c9tMI,14813
|
|
86
86
|
dotflow/logging.py,sha256=xjzHyAHIMLCtt1Kto_gZaFCzr_fyc51z1C9je2sm3ds,292
|
|
87
87
|
dotflow/main.py,sha256=ZxGTH_gX6CnKO9wb1vfjHpLQwaD5dLIBWM82K_puZEI,252
|
|
88
|
-
dotflow/providers/__init__.py,sha256=
|
|
88
|
+
dotflow/providers/__init__.py,sha256=aQigvJuf1vq5X-5-nWp3ET6uDp-Ek0l34nflGcZbjX8,2205
|
|
89
89
|
dotflow/providers/log_default.py,sha256=1X9jYqylwTMy1AJt5552SgmVWMR_B_JFcMe8QE8XHgQ,1796
|
|
90
90
|
dotflow/providers/log_opentelemetry.py,sha256=6A1LEVH3qNxAnqt6Zil23Tb7lZqL920SfstZ_TYX988,3094
|
|
91
91
|
dotflow/providers/log_sentry.py,sha256=ttVHkiFc1SRbt04xNtKJGtRlpfaN4JBVg5ZJnlD0-04,2695
|
|
@@ -96,8 +96,7 @@ dotflow/providers/notify_discord.py,sha256=9cOt3YwJzuZzpNQlMLdc3sfJ5hfFRBBAmpNoU
|
|
|
96
96
|
dotflow/providers/notify_telegram.py,sha256=xiyeqVSo_xQg3FR3_Q6Dnx2Qk8Sih2J7tkIVxkFSefk,3230
|
|
97
97
|
dotflow/providers/scheduler_cron.py,sha256=wRXI5g0fDrYkBgD5zAMa5T8xxjU9v1SjDNpmsQD8nwA,8245
|
|
98
98
|
dotflow/providers/scheduler_default.py,sha256=mkgMz5D6mROTDDY5juGXV4IgEDRPM0yW8_NJWDVfRTQ,258
|
|
99
|
-
dotflow/providers/
|
|
100
|
-
dotflow/providers/server_default.py,sha256=RRJMwN2oyyS_gHPif2fPJRGNsmTw2e3BmXVuQMYSR2M,500
|
|
99
|
+
dotflow/providers/server_default.py,sha256=T-Ex3BHkXWiF5pWFu65fKtaoJUdjOLnxaRA40H44qjk,3418
|
|
101
100
|
dotflow/providers/storage_default.py,sha256=ijE6cN0TlmTn8J5TiNvq_xakoK3JmciqI7qJWxesEBM,568
|
|
102
101
|
dotflow/providers/storage_file.py,sha256=N4BPiDWWDOUbh5suzWvYzX6ZUtjhrfdZgSqwBPDW__I,2154
|
|
103
102
|
dotflow/providers/storage_gcs.py,sha256=LgkS0zjlPElbvPhk7-uVKbNTnVn2OTtk8h5XltWIOH0,2484
|
|
@@ -111,8 +110,8 @@ dotflow/utils/__init__.py,sha256=AXiUm5p-FVG9SBWPxdG6jV0ft49EK6c40ME4aznPWQc,366
|
|
|
111
110
|
dotflow/utils/basic_functions.py,sha256=S-maghYauG5QkMtHdm7qNcxBkKkSoE4akHSiI178Bwg,131
|
|
112
111
|
dotflow/utils/error_handler.py,sha256=I8DY2AKR-WxKl8k7aUJPExS6wlzKVPy_u42ZJ9gYyts,272
|
|
113
112
|
dotflow/utils/tools.py,sha256=RtC0D1SnaNCB02cT-l0Dw8Wl6uDSQSABoZH2kdD1PJQ,787
|
|
114
|
-
dotflow-0.16.0.
|
|
115
|
-
dotflow-0.16.0.
|
|
116
|
-
dotflow-0.16.0.
|
|
117
|
-
dotflow-0.16.0.
|
|
118
|
-
dotflow-0.16.0.
|
|
113
|
+
dotflow-0.16.0.dev4.dist-info/METADATA,sha256=ODUQfHLoSp1YdXb3EylXMAbv-DX0j9IObYt3ucLwvTQ,40731
|
|
114
|
+
dotflow-0.16.0.dev4.dist-info/WHEEL,sha256=Vz2fHgx6HFtSwhs8KvkHLqH5Ea4w1_rner5uNVGCeIE,88
|
|
115
|
+
dotflow-0.16.0.dev4.dist-info/entry_points.txt,sha256=3AW0pYKZpaMW6WZmN3t71X0FuwxQdivmQwe47_6yBp4,45
|
|
116
|
+
dotflow-0.16.0.dev4.dist-info/licenses/LICENSE,sha256=0h5VY_8dcAiTIGt0weGPV6cjxdPGB37Pjusxm_WAiPU,10766
|
|
117
|
+
dotflow-0.16.0.dev4.dist-info/RECORD,,
|
dotflow/providers/server_api.py
DELETED
|
@@ -1,89 +0,0 @@
|
|
|
1
|
-
"""ServerAPI — sends workflow/task events to a remote HTTP endpoint."""
|
|
2
|
-
|
|
3
|
-
from __future__ import annotations
|
|
4
|
-
|
|
5
|
-
import logging
|
|
6
|
-
from typing import Any
|
|
7
|
-
|
|
8
|
-
from requests import patch, post
|
|
9
|
-
from requests.exceptions import RequestException
|
|
10
|
-
|
|
11
|
-
from dotflow.abc.server import Server
|
|
12
|
-
|
|
13
|
-
logger = logging.getLogger(__name__)
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
class ServerAPI(Server):
|
|
17
|
-
"""HTTP implementation of the Server ABC."""
|
|
18
|
-
|
|
19
|
-
def __init__(
|
|
20
|
-
self,
|
|
21
|
-
base_url: str,
|
|
22
|
-
user_token: str,
|
|
23
|
-
timeout: float = 15.0,
|
|
24
|
-
):
|
|
25
|
-
self._base_url = base_url.rstrip("/")
|
|
26
|
-
self._user_token = user_token
|
|
27
|
-
self._timeout = timeout
|
|
28
|
-
|
|
29
|
-
@property
|
|
30
|
-
def _headers(self) -> dict:
|
|
31
|
-
return {
|
|
32
|
-
"Authorization": f"Bearer {self._user_token}",
|
|
33
|
-
"Content-Type": "application/json",
|
|
34
|
-
}
|
|
35
|
-
|
|
36
|
-
def _post(self, url: str, json: dict) -> None:
|
|
37
|
-
try:
|
|
38
|
-
response = post(
|
|
39
|
-
url,
|
|
40
|
-
json=json,
|
|
41
|
-
headers=self._headers,
|
|
42
|
-
timeout=self._timeout,
|
|
43
|
-
)
|
|
44
|
-
logger.info("POST %s [%s]", url, response.status_code)
|
|
45
|
-
except RequestException as error:
|
|
46
|
-
logger.error("POST %s failed: %s", url, error)
|
|
47
|
-
|
|
48
|
-
def _patch(self, url: str, json: dict) -> None:
|
|
49
|
-
try:
|
|
50
|
-
response = patch(
|
|
51
|
-
url,
|
|
52
|
-
json=json,
|
|
53
|
-
headers=self._headers,
|
|
54
|
-
timeout=self._timeout,
|
|
55
|
-
)
|
|
56
|
-
logger.info("PATCH %s [%s]", url, response.status_code)
|
|
57
|
-
except RequestException as error:
|
|
58
|
-
logger.error("PATCH %s failed: %s", url, error)
|
|
59
|
-
|
|
60
|
-
def create_workflow(self, workflow: Any) -> None:
|
|
61
|
-
self._post(
|
|
62
|
-
f"{self._base_url}/workflows",
|
|
63
|
-
json={"id": str(workflow)},
|
|
64
|
-
)
|
|
65
|
-
|
|
66
|
-
def update_workflow(self, workflow: Any, status: str = "") -> None:
|
|
67
|
-
self._patch(
|
|
68
|
-
f"{self._base_url}/workflows/{workflow}",
|
|
69
|
-
json={"status": status},
|
|
70
|
-
)
|
|
71
|
-
|
|
72
|
-
def create_task(self, task: Any) -> None:
|
|
73
|
-
data = task.result(max=5_000_000)
|
|
74
|
-
data["id"] = data.pop("task_id", task.task_id)
|
|
75
|
-
self._post(
|
|
76
|
-
f"{self._base_url}/workflows/{task.workflow_id}/tasks",
|
|
77
|
-
json=data,
|
|
78
|
-
)
|
|
79
|
-
|
|
80
|
-
def update_task(self, task: Any) -> None:
|
|
81
|
-
data = task.result(max=5_000_000)
|
|
82
|
-
data["id"] = data.pop("task_id", task.task_id)
|
|
83
|
-
self._patch(
|
|
84
|
-
(
|
|
85
|
-
f"{self._base_url}/workflows/{task.workflow_id}"
|
|
86
|
-
f"/tasks/{task.task_id}"
|
|
87
|
-
),
|
|
88
|
-
json=data,
|
|
89
|
-
)
|
|
File without changes
|
|
File without changes
|
|
File without changes
|