nodezator 1.5.1__tar.gz → 1.5.3__tar.gz

{nodezator-1.5.1 → nodezator-1.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nodezator
-Version: 1.5.1
+Version: 1.5.3
 Summary: A generalist Python node editor
 Home-page: https://nodezator.com
 Author: Kennedy Richard

nodezator-1.5.3/nodezator/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.5.3"

{nodezator-1.5.1 → nodezator-1.5.3}/nodezator/appinfo.py

@@ -20,7 +20,7 @@ from collections import namedtuple
 
 AppVersion = namedtuple("AppVersion", "major minor micro release_level")
 
-APP_VERSION = AppVersion(1, 5, 1, "release_candidate")
+APP_VERSION = AppVersion(1, 5, 3, "release_candidate")
 
 
 ### titles for the application

{nodezator-1.5.1 → nodezator-1.5.3}/nodezator/data/aww/nodezator.pysite/about.htsl

@@ -14,7 +14,7 @@
 
   <p>For tutorials/examples/roadmap and more go to <a href="https://nodezator.com">nodezator.com</a>.</p>
 
-  <p>This software is developed by Kennedy Richard (<a href="https://kennedyrichard.com">website</a>|<a href="https://x.com/KennedyRichard">Twitter/X</a>) as part of the <a href="https://indiepython.com">Indie Python</a> project.</p>
+  <p>This software is developed by Kennedy Richard (<a href="https://kennedyrichard.com">website</a>|<a href="https://bsky.app/profile/kennedyrichard.com">Bluesky</a>|<a href="https://x.com/KennedyRichard">Twitter/X</a>) as part of the <a href="https://indiepython.com">Indie Python</a> project.</p>
 
   <p>Please, become our patron on <a href="https://patreon.com/kennedyrichard">patreon</a> to support development of this and other useful software. All donation methods available, including methods that allow one-time donations are can be found here: <a href="https://indiepython.com/donate">https://indiepython.com/donate</a></p>
 

{nodezator-1.5.1 → nodezator-1.5.3}/nodezator/data/aww/nodezator.pysite/whats-new/v1-5.htsl

@@ -14,6 +14,8 @@
 <ul>
     <li><a href="https://github.com/IndiePython/nodezator/releases/tag/v1.5.0">[v1.5.0] System testing, topological sorting and QOL features</a></li>
     <li><a href="https://github.com/IndiePython/nodezator/releases/tag/v1.5.1">[v1.5.1] Usability improvements and content update</a></li>
+    <li><a href="https://github.com/IndiePython/nodezator/releases/tag/v1.5.2">[v1.5.2] Bug fix for nodes with keyword-variable parameters</a></li>
+    <li><a href="https://github.com/IndiePython/nodezator/releases/tag/v1.5.3">[v1.5.3] User manual utility and file manager bug fix</a></li>
 </ul>
 
 <ol>
@@ -31,6 +33,8 @@
     <li><a href="whats-new/v1-5.htsl#improved-not-found-drawings">Improved "Not-found" drawings with SVG</a></li>
     <li><a href="whats-new/v1-5.htsl#fixes-other-back-end-changes">Fixes and other back-end changes</a></li>
     <li><a href="whats-new/v1-5.htsl#usability-improvements-content-update">v1.5.1: Usability improvements and content update</a></li>
+    <li><a href="whats-new/v1-5.htsl#bug-fix-keyword-variable">v1.5.2: Bug fix for nodes with keyword-variable parameters</a></li>
+    <li><a href="whats-new/v1-5.htsl#user-manual-utility-file-manager-fix">v1.5.3: User manual utility and file manager bug fix</a></li>
 
 </ol>
 
@@ -264,6 +268,32 @@
 <p>Finally, made a few small changes to the <code>menu</code> subpackage to make it easier to use widgets like checkbuttons and radiobuttons on the menus. The menu subpackage always had such widgets available, but we never needed to use them before. Now we use radiobuttons to allow users to choose their preferred socket detection graphics, so it was a great opportunity to improve their back end a bit. The appearance of the radiobuttons was improved as well. They are now rendered from SVG text.</p>
 
 
+<h2 id="bug-fix-keyword-variable">v1.5.2: Bug fix for nodes with keyword-variable parameters</h2>
+
+<p>I usually only write a summary of the changes here, detailing them on the commit messages themselves. However, since this was a pretty quick and simple fix, I'll just paste the commit message itself here:</p>
+
+<blockquote>
+
+  <p>Nodes with keyword-variable parameters (parameters prefixed with **) were being executed in the wrong way due to a bug that caused their arguments to be discarded when more than 01 variable keyword argument was collected.</p>
+
+  <p>This nasty bug could either cause all kinds of errors when executing the graph or even worse remain undetected, all due to the unexpected outputs that such nodes produce by ignoring the variable keyword arguments.</p>
+
+  <p>It was introduced in v1.5.0, when the entire graph execution mechanism was overhauled in order to adopt the topological sorting algorithm.</p>
+
+</blockquote>
+
+<p>We also updated social media links to include the <a href="https://bsky.app/profile/kennedyrichard.com">developer's (me) Bluesky profile</a> and also point to the developer's <a href="https://kennedyrichard.com/links">links page</a>, where several other useful links/addresses are available, including email.</p>
+
+
+<h2 id="user-manual-utility-file-manager-fix">v1.5.3: User manual utility and file manager bug fix</h2>
+
+<p>Code blocks on the in-app version of the user manual now have a new button that allows users to save that code snippet on disk. This change was made because the button to copy values to the clipboard is not working properly for all users. I still have to investigate the problem to know the cause, but it looks like it is not on Nodezator's source, since it works on some machines and not on others.</p>
+
+<p>To avoid hassle to the users (one of them reported having to type the code manually), this new button now allows them to save the code directly on disk. Of course, alternatively, the users always have the <a href="https://manual.nodezator.com">online version of the manual</a> available as well.</p>
+
+<p>I also fixed a bug on the file manager that sometimes caused paths to still be submitted despite the user having pressed the <b>Cancel</b> button. Naturally, this was a clearly undesired behaviour that could cause all kinds of undesired side-effects as well.</p>
+
+
 </body>
 
 </htsl>

{nodezator-1.5.1 → nodezator-1.5.3}/nodezator/data/locale/en_us/translations_map.pyl

@@ -98,7 +98,7 @@
     'developer_website_name' : "kennedyrichard.com",
     'developer_website_url'  : "https://kennedyrichard.com",
 
-    'developer_x' : "Developer Twitter/X",
+    'developer_links_social' : "Developer links/social/email",
 
     'license_declaration_text' : "Nodezator is dedicated to the public domain using The Unlicense",
 

{nodezator-1.5.1 → nodezator-1.5.3}/nodezator/data/locale/pt_br/translations_map.pyl

@@ -61,7 +61,7 @@
     'developer_website_name' : "br.kennedyrichard.com",
     'developer_website_url' : "https://br.kennedyrichard.com",
 
-    'developer_x': "Twitter/X do desenvolvedor",
+    'developer_links_social': "Links do desenvolvedor",
 
   },
 

{nodezator-1.5.1 → nodezator-1.5.3}/nodezator/fileman/op.py

@@ -117,6 +117,10 @@ class FileManagerOperations(Object2D):
         ### alias self as the loop holder
         loop_holder = self
 
+        ### set an attribute to keep track of when the user cancelled
+        ### selecting paths
+        self.cancelled = False
+
         ### keep looping the execution of methods
         ### "handle_input", "update" and "drawing" of the
         ### loop holder until running is set to False
@@ -156,11 +160,16 @@ class FileManagerOperations(Object2D):
         ### blit smaller semi transparent object
         self.rect_size_semitransp_obj.draw()
 
-        ### if only files are expected to be selected, we must
-        ### update the selection according to the entry, since
-        ### they might be out of sync
+        ### if the user didn't cancel and only files are expected to be
+        ### selected, we must update the selection according to the entry,
+        ### since they might be out of sync
 
-        if self.expecting_files_only:
+        ### XXX review behaviour of this expecting_files_only flag.
+        ### For instance, what if the person selected folders as well?
+        ### When you do that, update docstrings and related comments
+        ### accordingly
+
+        if not self.cancelled and self.expecting_files_only:
             self.update_selection_from_entry()
 
         ### return a copy of the path selection
@@ -482,9 +491,13 @@ class FileManagerOperations(Object2D):
         Works by clearing the path selection, which causes no
         path to be returned.
 
+        The 'cancelled' attribute is also set to True, to indicate the
+        user cancelled providing path(s).
+
         The 'running' attribute is also set to False, which
         triggers the exit of the file manager loop which
         you can find on the select_paths method.
         """
         self.path_selection.clear()
+        self.cancelled = True
         self.running = False

{nodezator-1.5.1 → nodezator-1.5.3}/nodezator/graphman/callablenode/execution.py

@@ -197,113 +197,109 @@ class Execution:
         ### and easier access
         arg_map = self.argument_map
 
-        ### iterate over the name of each parameter, performing
-        ### checks and acting according to their results
+        ### iterate over the name of each variable parameter, performing
+        ### setups according to their kind
 
         for param_name, kind in self.var_kind_map.items():
 
             ## retrieve subparam value map
             subparam_value_map = arg_map[param_name]
 
-            ## iterate over existing subparameters (if any),
-            ## unpacking the argument if requested
-
-            for subparam_index in self.data['subparam_map'][param_name]:
+            ## if we have a variable parameter of positional kind...
 
-                # perform additional setups depending on the
-                # specific kind of variable parameter we have
+            if kind == 'var_pos':
 
-                if kind == 'var_pos':
+                # retrieve the list of subparameters that must
+                # be unpacked
+                subparams_for_unpacking = (
+                    self.data['subparam_unpacking_map'][param_name]
+                )
 
-                    # retrieve the list of subparameters that must
-                    # be unpacked
-                    subparams_for_unpacking = (
-                        self.data['subparam_unpacking_map'][param_name]
-                    )
+                # retrieve the values of each subparameter in the
+                # order defined by the subparameter indices
+                # building a list with the values
 
-                    # retrieve the values of each subparameter in the
-                    # order defined by the subparameter indices
-                    # building a list with the values
+                param_args = []
 
-                    param_args = []
+                for index in sorted(subparam_value_map):
 
-                    for index in sorted(subparam_value_map):
+                    if index in subparams_for_unpacking:
 
-                        if index in subparams_for_unpacking:
+                        try:
+                            param_args.extend(subparam_value_map[index])
 
-                            try:
-                                param_args.extend(subparam_value_map[index])
+                        except Exception as err:
 
-                            except Exception as err:
+                            raise PositionalSubparameterUnpackingError(
+                                self,
+                                param_name,
+                                index,
+                            ) from err
 
-                                raise PositionalSubparameterUnpackingError(
-                                    self,
-                                    param_name,
-                                    index,
-                                ) from err
+                    else:
+                        param_args.append(subparam_value_map[index])
 
-                        else:
-                            param_args.append(subparam_value_map[index])
+                # replace the parameter data in the argument map
+                # by the list we populated
+                arg_map[param_name] = param_args
 
-                    # replace the parameter data in the argument map
-                    # by the list we populated
-                    arg_map[param_name] = param_args
+            ## if otherwise we have a variable parameter of the keyword kind...
 
-                elif kind == 'var_key':
+            elif kind == 'var_key':
 
-                    # retrieve map containing name of keyword for each
-                    # subparameter
-                    subparam_keywords = self.data['subparam_keyword_map']
+                # retrieve map containing name of keyword for each
+                # subparameter
+                subparam_keywords = self.data['subparam_keyword_map']
 
-                    # now build a new dictionary with the sorted keys
-                    # from the subparam value map and its values
+                # now build a new dictionary with the sorted keys
+                # from the subparam value map and its values
 
-                    param_args = {}
+                param_args = {}
 
-                    for index in sorted(subparam_value_map):
+                for index in sorted(subparam_value_map):
 
-                        value = subparam_value_map.pop(index)
+                    value = subparam_value_map.pop(index)
 
-                        if index in subparam_keywords:
-                            param_args[subparam_keywords[index]] = value
+                    if index in subparam_keywords:
+                        param_args[subparam_keywords[index]] = value
 
-                        else:
+                    else:
 
-                            # note that we use '.update(**value)'
-                            # instead of '.update(value)'; this is
-                            # so because '.update(value)' would be
-                            # more lenient than the '**', and thus
-                            # not equivalent ('**' only accepts
-                            # mappings, while .update accepts
-                            # other iterables as well);
-                            #
-                            # since we are emulating the behaviour
-                            # of '**', we go with the less lenient
-                            # behaviour of only accepting mappings
+                        # note that we use '.update(**value)'
+                        # instead of '.update(value)'; this is
+                        # so because '.update(value)' would be
+                        # more lenient than the '**', and thus
+                        # not equivalent ('**' only accepts
+                        # mappings, while .update accepts
+                        # other iterables as well);
+                        #
+                        # since we are emulating the behaviour
+                        # of '**', we go with the less lenient
+                        # behaviour of only accepting mappings
 
-                            try:
-                                param_args.update(**value)
+                        try:
+                            param_args.update(**value)
 
-                            except Exception as err:
+                        except Exception as err:
 
-                                raise KeywordSubparameterUnpackingError(
-                                    self,
-                                    param_name,
-                                    index,
-                                ) from err
+                            raise KeywordSubparameterUnpackingError(
+                                self,
+                                param_name,
+                                index,
+                            ) from err
 
-                    # replace the parameter data in
-                    # the argument map by the dict
-                    # we just created
-                    arg_map[param_name] = param_args
+                # replace the parameter data in
+                # the argument map by the dict
+                # we just created
+                arg_map[param_name] = param_args
 
-                else:
+            else:
 
-                    raise RuntimeError(
-                        "there shouldn't be possible to specify a variable"
-                        " parameter of a kind which is neither 'var_pos' or"
-                        " 'var_key'"
-                    )
+                raise RuntimeError(
+                    "there shouldn't be possible to specify a variable"
+                    " parameter of a kind which is neither 'var_pos' or"
+                    " 'var_key'"
+                )
 
 
     def receive_input(self, data, param_name, subparam_index=None):

{nodezator-1.5.1 → nodezator-1.5.3}/nodezator/htsl/codeblock.py

@@ -27,6 +27,8 @@ from ..classes2d.single import Object2D
 
 from ..surfsman.render import combine_surfaces, render_rect
 
+from ..surfsman.icon import render_layered_icon
+
 from ..surfsman.draw import draw_border
 
 from ..textman.render import render_text, get_text_size
@@ -40,7 +42,9 @@ from ..syntaxman.exception import SyntaxMappingError
 
 from ..syntaxman.utils import get_ready_theme
 
-from ..colorsman.colors import HTSL_GENERAL_TEXT_FG, HTSL_CANVAS_BG
+from ..dialog import create_and_show_dialog
+
+from ..colorsman.colors import BLACK, HTSL_GENERAL_TEXT_FG, HTSL_CANVAS_BG
 
 from .constants import (
     GENERAL_CODE_TEXT_SETTINGS,
@@ -104,6 +108,69 @@ def _get_clipboard_button_surf():
 COPY_TO_CLIPBOARD_SURF =  _get_clipboard_button_surf()
 
 
+def _get_save_button_surf():
+    """Create and return surface representing save button."""
+
+    ## text
+    text_surf = render_text(text='Save on disk', **NORMAL_TEXT_SETTINGS)
+
+    ## icon
+
+
+    _arrow_down_icon = render_layered_icon(
+        chars=[chr(ordinal) for ordinal in (50, 51)],
+        dimension_name="height",
+        dimension_value=12,
+        rotation_degrees=180,
+        colors=[
+            BLACK,
+            (30, 130, 70),
+        ],
+    )
+
+    _ssd_icon = render_layered_icon(
+        chars=[chr(ordinal) for ordinal in range(83, 87)],
+        dimension_name="width",
+        dimension_value=18,
+        colors=[
+            BLACK,
+            (255, 0, 0),
+            (0, 0, 255),
+            (140, 140, 140),
+        ],
+        background_width=20,
+        background_height=24,
+        retrieve_pos_from="midbottom",
+        assign_pos_to="midbottom",
+        offset_pos_by=(0, -2),
+    )
+
+    icon_surf = combine_surfaces(
+        [_ssd_icon, _arrow_down_icon],
+        retrieve_pos_from="midbottom",
+        assign_pos_to="midbottom",
+        offset_pos_by=(0, -10),
+    )
+
+
+    ## final combination
+
+    surf = combine_surfaces(
+        (text_surf, icon_surf),
+        retrieve_pos_from="midright",
+        assign_pos_to="midleft",
+        offset_pos_by=(4, 0),
+        padding=6,
+        background_color=HTSL_CANVAS_BG,
+    )
+
+    draw_border(surf, color=HTSL_GENERAL_TEXT_FG, thickness=2)
+
+    return surf
+
+SAVE_ON_DISK_SURF =  _get_save_button_surf()
+
+
 
 ### TODO ponder: should the code block surfaces be cached
 ### across different .htsl pages? they probably should.
@@ -359,6 +426,54 @@ def get_pre_textblock(pre_element):
 
     return obj
 
+def save_on_disk(text, extension):
+
+    ### TODO the import below is performed inside this function
+    ### temporariy, in order to avoid circular imports;
+    ###
+    ### however, given how often it is used throughout the package,
+    ## it should probably be passed around as a reference rather than
+    ### being imported, similarly to how the node manager, window manager
+    ### and editing assistant are passed around as references;
+
+    ### import select paths
+    from ..fileman.main import select_paths
+
+    ### prompt user to pick filepath from file manager
+
+    paths = (
+        select_paths(
+            caption="Save code snippet on disk",
+            path_name=f'snippet{extension}',
+            expecting_files_only=True,
+        )
+    )
+
+    ### if paths were given, it is a single one, we
+    ### should assign it to 'filepath' variable
+
+    if paths:
+        filepath = paths[0]
+
+    ### if the user didn't provide paths, though,
+    ### return earlier
+
+    else:
+
+        create_and_show_dialog("Cancelled saving snippet on disk.")
+        return
+
+    ###
+
+    try:
+        filepath.write_text(text, encoding='utf-8')
+
+    except Exception as err:
+
+        error_message = "An error occurred while trying to save snippet on disk: "
+        error_message += str(err)[:200]
+        create_and_show_dialog(error_message)
+
 def get_copy_button(text, bottomright):
 
     return Button(
@@ -368,8 +483,23 @@ def get_copy_button(text, bottomright):
 
         ## other arguments
 
-        command = (partial(put_text, text)),
+        command = partial(put_text, text),
+        coordinates_name='bottomright',
+        coordinates_value=bottomright,
+
+    )
+
+def get_save_button(text, extension, bottomright):
+
+    return Button(
+
+        ## surf
+        SAVE_ON_DISK_SURF,
+
+        ## other arguments
+
+        command = partial(save_on_disk, text, extension),
         coordinates_name='bottomright',
-        coordinates_value= bottomright,
+        coordinates_value=bottomright,
 
     )

{nodezator-1.5.1 → nodezator-1.5.3}/nodezator/htsl/constants.py

@@ -40,6 +40,8 @@ KNOWN_TAGS = (
     "dl",
 )
 
+PRE_PYTHON_TAGS = {'pre', 'python'}
+
 ### text settings
 
 ## anchor minus fg

{nodezator-1.5.1 → nodezator-1.5.3}/nodezator/htsl/main.py

@@ -454,8 +454,8 @@ class HTSLBrowser(
                             break
 
                 ### otherwise check whether the object has an on_mouse_release,
-                ### executing it and breaking out of the for-loop if it is the
-                ### case
+                ### executing it, redrawing the elements and breaking out of
+                ### the for-loop if it is the case
 
                 try:
                     method = obj.on_mouse_release
@@ -464,7 +464,9 @@ class HTSLBrowser(
                     pass
 
                 else:
+
                     method(event)
+                    self.draw_once()
                     break
 
                 ### regardless of what happened or not, break out of the

{nodezator-1.5.1 → nodezator-1.5.3}/nodezator/htsl/prep.py

@@ -22,7 +22,12 @@ from ..classes2d.collections import List2D
 
 from ..surfdef import surfdef_obj_from_element
 
-from .constants import BROWSER_TITLE, KNOWN_TAGS, HEADING_TAGS
+from .constants import (
+    BROWSER_TITLE,
+    KNOWN_TAGS,
+    HEADING_TAGS,
+    PRE_PYTHON_TAGS,
+)
 
 from .creation import (
     TextBlock,
@@ -41,12 +46,15 @@ from .codeblock import (
     get_python_codeblock,
     get_pre_textblock,
     get_copy_button,
+    get_save_button,
 )
 
 from ..colorsman.colors import HTSL_CANVAS_BG
 
 
+
 class Preparation:
+
     def __init__(self):
         self.cache = {}
 
@@ -179,30 +187,66 @@ class Preparation:
             retrieve_pos_from="bottom", assign_pos_to="top", offset_pos_by=(0, 14)
         )
 
-        ### if clipboard functionality is available and there are pre/python
-        ### tags in the page, add "copy to clipboard" button to each pre/python
-        ### tag
+        ### if there are pre/python tags in the page...
 
-        if PUT_TEXT_AVAILABLE and pre_or_python_tags:
 
-            ##
+        if pre_or_python_tags:
+
+            ### request buttons to be added to each pre/python tag
+
+            buttons_to_add = ['save_on_disk']
+
+            ### if clipboard functionality is available, request
+            ### "copy to clipboard" buttons to be added as well
+
+            if PUT_TEXT_AVAILABLE:
+                buttons_to_add.append('copy_to_clipboard')
+
+            ### add button/buttons
 
             index_button_pairs = []
 
             y_offset = 0
             offset_increment = COPY_TO_CLIPBOARD_SURF.get_height()
 
+            buttons = []
+
             for index, obj in enumerate(self.objs):
 
-                if getattr(obj, 'tag_name', '') in {'pre', 'python'}:
+                tag_name = getattr(obj, 'tag_name', '').lower()
+
+                if tag_name in PRE_PYTHON_TAGS:
 
                     y_offset += offset_increment
 
                     obj.rect.y += y_offset
 
-                    button = get_copy_button(obj.text, bottomright=obj.rect.topright)
+                    bottomright = obj.rect.topright
+
+                    for button_name in buttons_to_add:
+
+                        if button_name == 'save_on_disk':
+
+                            extension = '.py' if tag_name == 'python' else '.txt'
+                            button = get_save_button(obj.text, extension, bottomright)
+
+                        elif button_name == 'copy_to_clipboard':
+                            button = get_copy_button(obj.text, bottomright)
+
+                        buttons.append(button)
+
+                        bottomright = button.rect.bottomleft
+
+                        index_button_pairs.append((index, button))
+
+                    left_diff =  obj.rect.left - buttons[-1].rect.left
+
+                    if left_diff > 0:
+
+                        for button in buttons:
+                            button.rect.x += left_diff
 
-                    index_button_pairs.append((index, button))
+                    buttons.clear()
 
                 else:
                     obj.rect.y += y_offset

{nodezator-1.5.1 → nodezator-1.5.3}/nodezator/splashscreen/factoryfuncs.py

@@ -186,7 +186,7 @@ def get_project_link_objs():
         NODES_GALLERY_ICON,
         (IMAGE_SURFS_DB["indie_python_logo.png"][{"use_alpha": True}]),
         (IMAGE_SURFS_DB["kennedy_logo.png"][{"use_alpha": True}]),
-        (IMAGE_SURFS_DB["x_logo.png"][{"use_alpha": True}]),
+        (IMAGE_SURFS_DB["bluesky_logo.png"][{"use_alpha": True}]),
         (IMAGE_SURFS_DB["discord_logo.png"][{"use_alpha": True}]),
         (IMAGE_SURFS_DB["patreon_logo.png"][{"use_alpha": True}]),
         WEB_ICON,
@@ -239,8 +239,8 @@ def get_project_link_objs():
             t.splash_screen.developer_website_url,
         ),
         (
-            t.splash_screen.developer_x,
-            "https://x.com/KennedyRichard",
+            t.splash_screen.developer_links_social,
+            "https://kennedyrichard.com/links",
         ),
         (
             "Join us on discord",