dotflow 0.10.0.dev1__tar.gz → 0.10.0.dev2__tar.gz

{dotflow-0.10.0.dev1 → dotflow-0.10.0.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dotflow
-Version: 0.10.0.dev1
+Version: 0.10.0.dev2
 Summary: 🎲 Dotflow turns an idea into flow!
 License: MIT License
          
@@ -34,6 +34,8 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Provides-Extra: mongodb
+Requires-Dist: dotflow-mongodb ; extra == "mongodb"
 Requires-Dist: pydantic
 Requires-Dist: rich
 Requires-Dist: typing-extensions

{dotflow-0.10.0.dev1 → dotflow-0.10.0.dev2}/dotflow/__init__.py

@@ -1,6 +1,6 @@
 """Dotflow __init__ module."""
 
-__version__ = "0.10.0.dev1"
+__version__ = "0.10.0.dev2"
 __description__ = "🎲 Dotflow turns an idea into flow!"
 
 from .core.action import Action as action
@@ -10,10 +10,4 @@ from .core.dotflow import DotFlow
 from .core.task import Task
 
 
-__all__ = [
-    "action",
-    "Context",
-    "Config",
-    "DotFlow",
-    "Task"
-]
+__all__ = ["action", "Context", "Config", "DotFlow", "Task"]

{dotflow-0.10.0.dev1 → dotflow-0.10.0.dev2}/dotflow/abc/storage.py

@@ -10,7 +10,7 @@ class Storage(ABC):
     """Storage"""
 
     def __init__(self, *args, **kwargs):
-        super().__init__()
+        pass
 
     @abstractmethod
     def post(self, key: str, context: Context) -> None:

{dotflow-0.10.0.dev1 → dotflow-0.10.0.dev2}/dotflow/cli/commands/start.py

@@ -3,7 +3,7 @@
 from os import system
 
 from dotflow import DotFlow, Config
-from dotflow.providers import StorageInit, StorageFile
+from dotflow.providers import StorageDefault, StorageFile
 from dotflow.core.types.execution import TypeExecution
 from dotflow.cli.command import Command
 
@@ -14,7 +14,7 @@ class StartCommand(Command):
         workflow = DotFlow()
 
         if self.params.storage:
-            storage = {"default": StorageInit, "file": StorageFile}
+            storage = {"default": StorageDefault, "file": StorageFile}
 
             config = Config(
                 storage=storage.get(self.params.storage)(

{dotflow-0.10.0.dev1 → dotflow-0.10.0.dev2}/dotflow/core/config.py

@@ -1,7 +1,7 @@
 """Config module"""
 
 from dotflow.abc.storage import Storage
-from dotflow.providers.storage_init import StorageInit
+from dotflow.providers.storage_default import StorageDefault
 
 
 class Config:
@@ -9,12 +9,13 @@ class Config:
     Import:
         You can import the **Config** class with:
 
-            from dotflow import Config, StorageInit
+            from dotflow import Config
+            from dotflow.storage import StorageDefault
 
     Example:
         `class` dotflow.core.config.Config
 
-            config = Config(storage=StorageInit)
+            config = Config(storage=StorageDefault)
 
     Args:
         storage (Storage): Type of the storage.
@@ -23,5 +24,5 @@ class Config:
         storage (Storage):
     """
 
-    def __init__(self, storage: Storage = StorageInit()) -> None:
+    def __init__(self, storage: Storage = StorageDefault()) -> None:
         self.storage = storage

{dotflow-0.10.0.dev1 → dotflow-0.10.0.dev2}/dotflow/core/context.py

@@ -19,8 +19,6 @@ class ContextInstance:
         self._task_id = None
         self._workflow_id = None
         self._storage = None
-        self._current_key = None
-        self._previous_key = None
 
 
 class Context(ContextInstance):

{dotflow-0.10.0.dev1 → dotflow-0.10.0.dev2}/dotflow/core/dotflow.py

@@ -50,7 +50,7 @@ class DotFlow:
         self.start = partial(
             Workflow,
             tasks=self.task.queu,
-            id=self.workflow_id
+            workflow_id=self.workflow_id
         )
 
     def result_task(self):

{dotflow-0.10.0.dev1 → dotflow-0.10.0.dev2}/dotflow/core/execution.py

@@ -15,7 +15,6 @@ from dotflow.core.action import Action
 from dotflow.core.context import Context
 from dotflow.core.task import Task
 from dotflow.core.types import TaskStatus
-
 from dotflow.core.decorators import time
 
 
@@ -147,6 +146,7 @@ class Execution:
 
         except Exception as err:
             self.task.status = TaskStatus.FAILED
+            self.task.current_context = None
             self.task.error = err
 
         finally:

{dotflow-0.10.0.dev1 → dotflow-0.10.0.dev2}/dotflow/core/workflow.py

@@ -49,10 +49,10 @@ class Workflow:
             there is the option to execute in **sequential** mode or **background** mode.
             By default, it is in **sequential** mode.
 
-        id (UUID):
+        workflow_id (UUID):
 
     Attributes:
-        id (UUID)
+        workflow_id (UUID):
         started (datetime):
         tasks (List[Task]):
         success (Callable):
@@ -66,9 +66,9 @@ class Workflow:
         failure: Callable = basic_callback,
         keep_going: bool = False,
         mode: TypeExecution = TypeExecution.SEQUENTIAL,
-        id: UUID = uuid4()
+        workflow_id: UUID = None
     ) -> None:
-        self.id = id
+        self.workflow_id = workflow_id or uuid4()
         self.started = datetime.now()
         self.tasks = tasks
         self.success = success
@@ -87,15 +87,16 @@ class Workflow:
             self.success(tasks=tasks)
 
     def sequential(self, keep_going: bool = False):
+        """Sequential"""
         previous_context = Context(
             task_id=0,
-            workflow_id=self.id
+            workflow_id=self.workflow_id
         )
 
         for task in self.tasks:
             Execution(
                 task=task,
-                workflow_id=self.id,
+                workflow_id=self.workflow_id,
                 previous_context=previous_context
             )
 
@@ -111,6 +112,7 @@ class Workflow:
         return self.tasks
 
     def background(self, keep_going: bool = False):
+        """Background"""
         th = threading.Thread(target=self.sequential, args=[keep_going])
         th.start()
 

dotflow-0.10.0.dev2/dotflow/providers/__init__.py

@@ -0,0 +1,6 @@
+"""Providers __init__ module."""
+
+from dotflow.providers.storage_default import StorageDefault
+from dotflow.providers.storage_file import StorageFile
+
+__all__ = ["StorageDefault", "StorageFile"]

dotflow-0.10.0.dev1/dotflow/providers/storage_init.py → dotflow-0.10.0.dev2/dotflow/providers/storage_default.py

@@ -1,4 +1,4 @@
-"""Init"""
+"""Storage Default"""
 
 from typing import Callable
 from ctypes import cast, py_object
@@ -7,7 +7,7 @@ from dotflow.abc.storage import Storage
 from dotflow.core.context import Context
 
 
-class StorageInit(Storage):
+class StorageDefault(Storage):
     """Storage"""
 
     def post(self, key: str, context: Context) -> None:

dotflow-0.10.0.dev2/dotflow/providers/storage_file.py

@@ -0,0 +1,66 @@
+"""Storage File"""
+
+from pathlib import Path
+from typing import Any, Callable
+from json import dumps, loads
+
+from dotflow.abc.storage import Storage
+from dotflow.core.context import Context
+from dotflow.utils import read_file, write_file
+from dotflow.settings import Settings as settings
+
+
+class StorageFile(Storage):
+    """Storage"""
+
+    def __init__(self, *args, path: str = settings.START_PATH, **kwargs):
+        self.path = Path(path, "tasks")
+        self.path.mkdir(parents=True, exist_ok=True)
+
+    def post(self, key: str, context: Context) -> None:
+        task_context = []
+
+        if Path(self.path, key).exists():
+            task_context = read_file(path=Path(self.path, key))
+
+        if isinstance(context.storage, list):
+            for item in context.storage:
+                if isinstance(item, Context):
+                    task_context.append(self._dumps(storage=item.storage))
+
+            write_file(path=Path(self.path, key), content=task_context, mode="a")
+            return None
+
+        task_context.append(self._dumps(storage=context.storage))
+        write_file(path=Path(self.path, key), content=task_context)
+        return None
+
+    def get(self, key: str) -> Context:
+        task_context = []
+
+        if Path(self.path, key).exists():
+            task_context = read_file(path=Path(self.path, key))
+
+        if len(task_context) == 1:
+            return self._loads(storage=task_context[0])
+
+        contexts = Context(storage=[])
+        for context in task_context:
+            contexts.storage.append(self._loads(storage=context))
+
+        return contexts
+
+    def key(self, task: Callable):
+        return f"{task.workflow_id}-{task.task_id}.json"
+
+    def _loads(self, storage: Any) -> Context:
+        try:
+            return Context(storage=loads(storage))
+        except Exception:
+            return Context(storage=storage)
+
+    def _dumps(self, storage: Any) -> str:
+        try:
+            return dumps(storage)
+        except TypeError:
+            return str(storage)

dotflow-0.10.0.dev2/dotflow/storage.py

@@ -0,0 +1,21 @@
+"""Storage module"""
+
+from dotflow.core.exception import ModuleNotFound
+
+from .providers.storage_default import StorageDefault
+from .providers.storage_file import StorageFile
+
+
+class _MongoDBModuleNotFound:
+
+    def __init__(self, *args, **kwargs):
+        raise ModuleNotFound(module="StorageMongoDB", library="dotflow-mongodb")
+
+
+try:
+    from dotflow_mongodb import StorageMongoDB  # type: ignore
+except ModuleNotFoundError:
+    StorageMongoDB = _MongoDBModuleNotFound
+
+
+__all__ = ["StorageDefault", "StorageFile", "StorageMongoDB"]

{dotflow-0.10.0.dev1 → dotflow-0.10.0.dev2}/dotflow/utils/__init__.py

@@ -2,7 +2,7 @@
 
 from dotflow.utils.error_handler import traceback_error, message_error
 from dotflow.utils.basic_functions import basic_function, basic_callback
-from dotflow.utils.tools import make_dir, copy_file, write_file, read_file
+from dotflow.utils.tools import write_file, read_file
 
 
 __all__ = [
@@ -10,8 +10,6 @@ __all__ = [
     "message_error",
     "basic_function",
     "basic_callback",
-    "make_dir",
-    "copy_file",
     "write_file",
     "read_file"
 ]

dotflow-0.10.0.dev2/dotflow/utils/tools.py

@@ -0,0 +1,48 @@
+"""Tools"""
+
+from pathlib import Path
+from typing import Any
+from json import loads, dumps, JSONDecodeError
+from os import system
+
+
+def write_file_system(
+        path: str,
+        content: str,
+        mode: str = "w"
+) -> None:
+    """Write file system"""
+    if mode == "a":
+        system(f"echo '{content}' >> {path}")
+
+    if mode == "w":
+        system(f"echo '{content}' > {path}")
+
+
+def write_file(
+        path: str,
+        content: Any,
+        mode: str = "w",
+        encoding: str = "utf-8"
+) -> None:
+    """Write file"""
+    try:
+        with open(file=path, mode=mode, encoding=encoding) as file:
+            file.write(dumps(content))
+    except TypeError:
+        with open(file=path, mode=mode, encoding=encoding) as file:
+            file.write(str(content))
+
+
+def read_file(
+        path: Path,
+        encoding: str = "utf-8"
+) -> Any | None:
+    """Read file"""
+    if path.exists():
+        with open(file=path, mode="r", encoding=encoding) as file:
+            try:
+                return loads(file.read())
+            except JSONDecodeError:
+                return file.read()
+    return None

{dotflow-0.10.0.dev1 → dotflow-0.10.0.dev2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dotflow"
-version = "0.10.0.dev1"
+version = "0.10.0.dev2"
 authors = [
   { name="Fernando Celmer", email="email@fernandocelmer.com" },
 ]
@@ -30,9 +30,12 @@ Issues = "https://github.com/dotflow-io/dotflow/issues"
 Repository = "https://github.com/dotflow-io/dotflow"
 Documentation = "https://github.com/dotflow-io/dotflow/blob/master/README.md"
 
+[project.optional-dependencies]
+mongodb = ["dotflow-mongodb"]
+
 [tool.poetry]
 name = "dotflow"
-version = "0.10.0.dev1"
+version = "0.10.0.dev2"
 description = "🎲 Dotflow turns an idea into flow!"
 authors = ["Fernando Celmer <email@fernandocelmer.com>"]
 readme = "README.md"
@@ -77,6 +80,12 @@ mkdocs-simple-blog = "^0.1.0"
 mkdocstrings = {extras = ["python"], version = "^0.29.0"}
 griffe-typingdoc = "^0.2.8"
 
+
+[[tool.poetry.source]]
+name = "test"
+url = "https://test.pypi.org/simple/"
+priority = "supplemental"
+
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"

dotflow-0.10.0.dev1/dotflow/providers/__init__.py

@@ -1,9 +0,0 @@
-"""Providers __init__ module."""
-
-from dotflow.providers.storage_file import StorageFile
-from dotflow.providers.storage_init import StorageInit
-
-__all__ = [
-    "StorageFile",
-    "StorageInit"
-]

dotflow-0.10.0.dev1/dotflow/providers/storage_file.py

@@ -1,35 +0,0 @@
-"""Local"""
-
-from pathlib import Path
-from typing import Callable
-
-from dotflow.abc.storage import Storage
-from dotflow.core.context import Context
-from dotflow.utils import read_file, write_file
-from dotflow.settings import Settings as settings
-
-
-class StorageFile(Storage):
-    """Storage"""
-
-    def __init__(self, path: str = settings.START_PATH, *args, **kwargs):
-        self.path = Path(path, "tasks")
-        self.path.mkdir(parents=True, exist_ok=True)
-
-    def post(self, key: str, context: Context) -> None:
-        if isinstance(context.storage, list):
-            content = ""
-            for item in context.storage:
-                if isinstance(item, Context):
-                    content += f"{str(item.storage)}\n"
-
-            write_file(path=Path(self.path, key), content=content, mode="a")
-            return None
-
-        write_file(path=Path(self.path, key), content=str(context.storage))
-
-    def get(self, key: str) -> Context:
-        return Context(storage=read_file(path=Path(self.path, key)))
-
-    def key(self, task: Callable):
-        return f"{task.workflow_id}-{task.task_id}"

dotflow-0.10.0.dev1/dotflow/providers/zeromq.py

@@ -1,49 +0,0 @@
-# """ZeroMQ module"""
-
-# import asyncio
-
-# from typing import Callable
-
-# from zmq import Context as ContextClient, PUSH, PULL, POLLIN  # type: ignore
-# from zmq.asyncio import Context as ContextServer, Poller  # type: ignore
-
-# from dotflow.abc.tcp import TCPClient, TCPServer
-
-
-# class ZeroMQClient(TCPClient):
-
-#     def __init__(self, url: str):
-#         self.url = url
-#         self.context = ContextClient.instance()
-
-#     def sender(self, content: dict) -> None:
-#         push = self.context.socket(PUSH)
-#         push.bind(self.url)
-#         push.send_json(content)
-
-
-# class ZeroMQServer(TCPServer):
-
-#     def __init__(self, url: str, handler: Callable):
-#         self.url = url
-#         self.handler = handler
-#         self.context = ContextServer.instance()
-
-#     async def receiver(self) -> None:
-#         pull = self.context.socket(PULL)
-#         pull.connect(self.url)
-
-#         poller = Poller()
-#         poller.register(pull, POLLIN)
-
-#         while True:
-#             events = await poller.poll()
-
-#             if pull in dict(events):
-#                 content = await pull.recv_json()
-#                 self.handler(content, content=content)
-
-#     async def run(self) -> None:
-#         await asyncio.wait(
-#             [asyncio.create_task(self.receiver())]
-#         )

dotflow-0.10.0.dev1/dotflow/storage.py

@@ -1,28 +0,0 @@
-"""Storage module"""
-
-from dotflow.core.exception import ModuleNotFound
-
-from .providers.storage_file import StorageFile
-from .providers.storage_init import StorageInit
-
-
-class _MongoDBModuleNotFound:
-
-    def __init__(self, *args, **kwargs):
-        raise ModuleNotFound(
-            module="StorageMongoDB",
-            library="dotflow-mongodb"
-        )
-
-
-try:
-    from dotflow_mongodb import StorageMongoDB
-except ModuleNotFoundError:
-    StorageMongoDB = _MongoDBModuleNotFound
-
-
-__all__ = [
-    "StorageFile",
-    "StorageInit",
-    "StorageMongoDB"
-]

dotflow-0.10.0.dev1/dotflow/utils/tools.py

@@ -1,53 +0,0 @@
-"""Tools"""
-
-import json
-import logging
-from pathlib import Path
-
-from os import makedirs, system
-from shutil import copy
-
-
-def make_dir(path: str, show_log: bool = False):
-    try:
-        makedirs(name=path, exist_ok=True)
-    except Exception as err:
-        if show_log:
-            logging.error(err)
-
-
-def copy_file(
-        source: str,
-        destination: str,
-        show_log: bool = False
-) -> None:
-    try:
-        copy(src=source, dst=destination)
-    except Exception as err:
-        if show_log:
-            logging.error(err)
-
-
-def write_file(
-        path: str,
-        content: str,
-        mode: str = "w"
-) -> None:
-    if isinstance(content, dict) or isinstance(content, list):
-        content = json.dumps(content)
-
-    try:
-        with open(file=path, mode=mode, encoding="utf-8") as file:
-            file.write(content)
-    except Exception:
-        if mode == "a":
-            system(f"echo '{content}' >> {path}")
-
-        if mode == "w":
-            system(f"echo '{content}' > {path}")
-
-
-def read_file(path: Path) -> str:
-    if path.exists():
-        with open(file=path, mode="r") as file:
-            return file.read()