funcnodes 0.2.2__tar.gz → 0.2.5__tar.gz

{funcnodes-0.2.2 → funcnodes-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: funcnodes
-Version: 0.2.2
+Version: 0.2.5
 Summary: funcnodes
 Author: Julian Kimmig
 Author-email: julian.kimmig@linkdlab.de
@@ -10,10 +10,11 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: exposedfunctionality (>=0.3.6,<0.4.0)
-Requires-Dist: poetry-plugin-export (>=1.7.1,<2.0.0)
-Requires-Dist: python-dotenv (>=1.0.1,<2.0.0)
-Requires-Dist: virtualenv (>=20.25.1,<21.0.0)
+Requires-Dist: exposedfunctionality (>=0.3,<0.4)
+Requires-Dist: poetry
+Requires-Dist: poetry-plugin-export (>=1.7,<2.0)
+Requires-Dist: python-dotenv
+Requires-Dist: virtualenv
 Requires-Dist: websockets (>=12.0,<13.0)
 Description-Content-Type: text/markdown
 

{funcnodes-0.2.2 → funcnodes-0.2.5}/funcnodes/__init__.py

@@ -66,6 +66,6 @@ __all__ = [
     "DataEnum",
 ]
 
-__version__ = "0.2.2"
+__version__ = "0.2.5"
 
 DEBUG = True

{funcnodes-0.2.2 → funcnodes-0.2.5}/funcnodes/basic_nodes/files.py

@@ -27,7 +27,16 @@ class FileDownloadNode(Node):
           url (str): The URL of the file to download.
           timeout (float): The timeout in seconds for the download request.
         """
-        response = requests.get(url, timeout=timeout)
+        response = requests.get(
+            url,
+            timeout=timeout,
+            headers={
+                # set user agent to avoid 403 forbidden error
+                "User-Agent": "Mozilla/5.0",
+                # allow download of files
+                "Accept": "*/*",
+            },
+        )
         self.outputs["data"].value = response.content
 
 

{funcnodes-0.2.2 → funcnodes-0.2.5}/funcnodes/data.py

@@ -33,14 +33,34 @@ class DataEnum(enum.Enum):
             cls.__name__,
         )
 
+        cls._lookup = {}
+        for member in cls:
+            cls._lookup[member.name] = member
+            try:
+                if member.value not in cls._lookup:
+                    cls._lookup[member.value] = member
+            except TypeError:
+                pass
+            if str(member.value) not in cls._lookup:
+                cls._lookup[str(member.value)] = member
+
     @classmethod
     def interfere(cls: Type[ET], a: Union[ET, str, Any]) -> ET:
-        if isinstance(a, str) and a in cls.__members__:
-            return cls[a]
-        elif isinstance(a, cls):
+
+        if isinstance(a, cls):
             return a
-        else:
+        if a in cls._lookup:
+            return cls._lookup[a]
+        try:
             return cls(a)
+        except ValueError as e:
+            if isinstance(a, str):
+                if a.startswith(cls.__name__ + "."):
+                    a = a[len(cls.__name__) + 1 :]
+                    if a in cls._lookup:
+                        return cls._lookup[a]
+
+            raise e
 
     @classmethod
     def v(cls: Type[ET], a: Union[ET, str, Any]) -> Any:

{funcnodes-0.2.2 → funcnodes-0.2.5}/funcnodes/lib/libfinder.py

@@ -73,7 +73,10 @@ def find_shelf_from_module(
 
         module = importlib.import_module(strmod)
         # reload module to get the latest version
-        importlib.reload(module)
+        try:
+            importlib.reload(module)
+        except Exception as e:
+            pass
         # for submod in submodules[1:]:
         #     mod = getattr(mod, submod)
 

{funcnodes-0.2.2 → funcnodes-0.2.5}/funcnodes/node.py

@@ -264,7 +264,7 @@ class Node(EventEmitterMixin, ABC, metaclass=NodeMeta):
 
     default_render_options: RenderOptions = {}
     default_io_options: Dict[str, NodeInputOptions | NodeOutputOptions] = {}
-    default_trigger_on_create: bool = False
+    default_trigger_on_create: bool = True
 
     triggerinput = NodeInput(
         id="_triggerinput",
@@ -704,6 +704,7 @@ class Node(EventEmitterMixin, ABC, metaclass=NodeMeta):
             if "_triggerinput" in kwargs:
                 del kwargs["_triggerinput"]
             try:
+
                 ans = await self.func(**kwargs)
                 # reset the inputs if requested
                 if self.reset_inputs_on_trigger:
@@ -893,6 +894,23 @@ class FullNodeJSON(BaseNodeJSON):
 REGISTERED_NODES: Dict[str, Type[Node]] = {}
 
 
+def _get_node_src(node: Type[Node]) -> str:
+    try:
+        file = inspect.getfile(node)
+    except Exception:
+        file = "<unknown file>"
+    try:
+        line = inspect.getsourcelines(node)[1]
+    except Exception:
+        line = "<unknown line>"
+
+    try:
+        module = node.__module__
+    except Exception:
+        module = "<unknown module>"
+    return f"{module}({file}:{line})"
+
+
 def register_node(node_class: Type[Node]):
     """
     Registers a node class by adding it to the REGISTERED_NODES dictionary with its 'node_id' as the key.
@@ -906,7 +924,9 @@ def register_node(node_class: Type[Node]):
     """
     node_id = node_class.node_id
     if node_id in REGISTERED_NODES:
-        raise NodeIdAlreadyExistsError(f"Node with id {node_id} already exists")
+        raise NodeIdAlreadyExistsError(
+            f"Node with id '{node_id}' already exists at {_get_node_src(REGISTERED_NODES[node_id])}"
+        )
 
     REGISTERED_NODES[node_id] = node_class
 

{funcnodes-0.2.2 → funcnodes-0.2.5}/funcnodes/nodemaker.py

@@ -37,6 +37,7 @@ def node_class_maker(
     id: Optional[str] = None,
     func: Callable[..., ReturnType] = None,
     superclass: Type[Node] = Node,
+    seperate_thread: bool = False,
     **kwargs: Unpack[NodeClassDict],
 ) -> Type[Node]:
     """
@@ -87,6 +88,22 @@ def node_class_maker(
         in_func: ExposedFunction[Coroutine[Any, Any, ReturnType]] = in_func
         asyncfunc = in_func
 
+    if seperate_thread:
+        oasyncfunc = asyncfunc
+
+        @wraps(oasyncfunc)
+        async def _wrapped_func(*args, **kwargs):
+            """
+            A wrapper for the exposed function that sets the output values of the node.
+            """
+            loop = asyncio.get_event_loop()
+            outs = await loop.run_in_executor(
+                None, lambda: asyncio.run(oasyncfunc(*args, **kwargs))
+            )
+            return outs
+
+        asyncfunc = _wrapped_func
+
     exfunc: ExposedFunction[Coroutine[Any, Any, ReturnType]] = asyncfunc
 
     @wraps(asyncfunc)
@@ -146,6 +163,7 @@ class NodeDecoratorKwargs(ExposedMethodKwargs, NodeClassDict, total=False):
     """
 
     superclass: Optional[Type[Node]]
+    seperate_thread: Optional[bool]
 
 
 def NodeDecorator(
@@ -176,7 +194,11 @@ def NodeDecorator(
         func = assure_exposed_method(func, **exposed_method_kwargs)
         # Create the node class
         return node_class_maker(
-            id, func, superclass=kwargs.get("superclass", Node), **node_class_kwargs
+            id,
+            func,
+            superclass=kwargs.get("superclass", Node),
+            seperate_thread=kwargs.get("seperate_thread", False),
+            **node_class_kwargs,
         )
 
     return decorator

{funcnodes-0.2.2 → funcnodes-0.2.5}/pyproject.toml

@@ -1,24 +1,25 @@
 [tool.poetry]
 name = "funcnodes"
-version = "0.2.2"
+version = "0.2.5"
 description = "funcnodes"
 authors = ["Julian Kimmig <julian.kimmig@linkdlab.de>"]
 readme = "README.md"
 
 [tool.poetry.dependencies]
 python = "^3.9"
-exposedfunctionality = "^0.3.6"
+exposedfunctionality = "^0.3"
 websockets = "^12.0"
-virtualenv = "^20.25.1"
-poetry-plugin-export = "^1.7.1"
-python-dotenv = "^1.0.1"
+virtualenv = "*"
+poetry-plugin-export = "^1.7"
+python-dotenv = "*"
+poetry = "*" 
 
 [tool.poetry.group.dev.dependencies]
-pytest = "^7.4.2"
-coverage = "^7.3.2"
-pandas = "^2.2.0"
-pillow = "^10.2.0"
-opencv-python = "^4.9.0.80"
+pytest = "^7.4"
+coverage = "^7.3"
+pandas = "^2.2"
+pillow = "^10.2"
+opencv-python = "^4.9"
 vulture = "^2.11"
 
 [build-system]