More anchors + new features (long overdue): :hide-header:, :nested: complete, :post-process: #100

TomerGodinger · 2022-04-14T13:02:41Z

This adds the following features:

:hide-header: option: omits the title and description from the output.
:nested: complete option: produces a fuller listing with title, description, usage, short summary and then full nested details. Feel free to change the name to whatever you want if you choose to keep it. =)
:post-process: path.to.module:func_name option: invokes the specified function in the specified module on the list of generated nodes for each command. The function should get the command used and the list of nodes that were generated.

This also adds quite a few new anchors for cross-referencing - namely one for each .. program:: directive, and for options and environment variables, an anchor is added per option name. For example, for a command group grp, command cmd, an option that has the flags -f and --flag and an environment variable env that provides a default for it, the following anchors will be created:

grp-cmd-f
grp-cmd-flag
grp-cmd-f-env
grp-cmd-flag-env

This has a caveat which I haven't dealt with, which is collisions.
Having an option with the flag names -f and --f would cause the same anchor to be created twice. Similarly a command called cmd with the flag --some-flag and a command called cmd-some with the flag --flag would both create the anchor cmd-some-flag. It may be a good idea to change the format so it's injective.
This actually applies to existing anchors as well, e.g. group grp + command some-cmd + option opt would yield the same option anchor as group grp-some + command cmd + option opt, if I'm not mistaken.
A decision not to support this would be valid, of course, but it's something that begs consideration at the least.

As mentioned in the title, this is not a finished, polished product.
While it does seem to work in general, I haven't tested it thoroughly, and since it adds new anchors, it currently breaks nearly all the existing tests, as they don't expect to get them.

stephenfin

A good start. Got a few suggestions inline. Tests would really help a lot here. Also, I see a couple of cases where you add things in the first patch and remove them again in the second or third one. Can you rebase and clean these up before force pushing updates?

sphinx_click/ext.py

stephenfin · 2022-04-14T17:04:38Z

sphinx_click/ext.py

@@ -491,8 +495,6 @@ def _generate_nodes(
        :returns: A list of nested docutil nodes
        """
        ctx = click.Context(command, info_name=name, parent=parent)
-        if nested == NESTED_COMPLETE:
-            print("Nested with COMPLETE")


Can you avoid adding this in the prior commit, please

Oh damn, I'm really sorry, I was sure I'd removed all that stuff...
Will be removed, of course.

sphinx_click/ext.py

TomerGodinger · 2022-04-17T09:09:35Z

Thanks for all the suggestions.
I'll make the changes when I can and submit another PR (or can I update this one instead?).
Sorry for the mess. This is the first PR I've made and I'm not well-versed in how it works.

TomerGodinger · 2022-04-18T09:21:20Z

A good start. Got a few suggestions inline. Tests would really help a lot here. Also, I see a couple of cases where you add things in the first patch and remove them again in the second or third one. Can you rebase and clean these up before force pushing updates?

Can you please tell me which cases of adding and removing the same things you're referring to?
The only such thing I've found was that debug print, which needed to disappear altogether.
I don't see anything else of the sort.

TomerGodinger · 2022-05-24T09:41:23Z

@stephenfin Just a friendly reminder that I'm waiting for your replies before I update this PR.

stephenfin

Sorry for the delayed response. Let me know if anything is unclear and thanks for the reminder.

sphinx_click/ext.py

TomerGodinger · 2022-06-01T15:38:52Z

I've pushed an update based on everything we've discussed.
Also fixed the tests and added another one for the complete nesting.
Tell me what you think when you can please.

stephenfin · 2022-06-26T13:03:23Z

I've pushed an update based on everything we've discussed. Also fixed the tests and added another one for the complete nesting. Tell me what you think when you can please.

Oh, I missed this reply. Will look later today or tomorrow 🙈

stephenfin · 2022-06-28T15:55:55Z

@TomerGodinger I reworked a few of the commits and fixed broken type checks but the general content should be the same. Could you take a look over and see if you're happy with it? Could you update the docs just to reflect the new changes? Once that's done, I think we're good to go.

PS: You can probably drop WIP from the PR title now too 😄

TomerGodinger · 2022-07-13T08:47:41Z

Hey, sorry for the delay.
I haven't had time to do this, but I'll try to get on it as soon as I can.

lorenzo-cavazzi

Sorry for interfering; I was looking for something similar to hide-header and I found your PR. These are all great additions!

I believe there is a small inconsistency when using hide-header, see the comment inline.

lorenzo-cavazzi · 2022-08-05T13:31:09Z

sphinx_click/ext.py

+        if hide_header:
+            final_nodes = subcommand_nodes
+
+            if nested == NESTED_NONE or nested == NESTED_SHORT:
+                section = nodes.paragraph()
+                self.state.nested_parse(result, 0, section)
+                final_nodes.insert(0, section)
+
+        else:
+            # Title
+
+            section = nodes.section(
+                '',
+                nodes.title(text=name),
+                ids=[nodes.make_id(ctx.command_path)],
+                names=[nodes.fully_normalize_name(ctx.command_path)],
+            )
+
+            sphinx_nodes.nested_parse_with_titles(self.state, result, section)
+
+            for node in subcommand_nodes:
+                section.append(node)
+            final_nodes = [section]


I feel the behavior here is inconsistent depending on :nested: short / full.
With short, the headers are hidden as expected (left is without hide-header)

With full, the headers are still hidden, but the main command also disappears:
in the following example, the missing command is

renku project [OPTIONS] COMMAND [ARGS]...

I thought this could be circumvented by combining :nested: none and :hide-header: + :nested: full and :hide-header: , but the result is slightly different since part of the header is still shown:
in the following example, the additional text is

Project commands.

sravel · 2023-02-17T11:45:46Z

hello I want to use the option :hide-header:
can you fix and valid merge request?

sravel · 2024-02-06T12:45:22Z

will this request be included?

stephenfin · 2024-02-12T15:39:07Z

@sravel Someone needs to pick this up again as I assume @TomerGodinger no longer needs this.

Add anchors to all the Click components (i.e. groups and commands), along with another general one for options so that now using the full path of the component with separating dashes is always a valid reference. E.g. for a group "mygroup", command "mycommand" and option "-myoption", all of the following work: :ref:`My Group <mygroup>` :ref:`My Command <mygroup-mycommand>` :ref:`My Option <mygroup-mycommand-myoption>` :option:`My Option <mygroup-mycommand -myoption>`

Adding :hide-header: to the directive will hide the title, description and usage and only show the commands. This also means that the commands will not be under a single section, but rather add a section each to where the directive is located. The ":nested: complete" option shows the name, description, usage, short command overview (basically the entire ":nested: short" option) followed by the details of the commands from the ":nested: full" option.

By providing the option ":post-process: module.path:funcion", the user can direct the directive to run the provided function on the command and its generated node for each command processed. This allows for full per-command customization of the output.

TomerGodinger · 2024-02-20T17:07:29Z

Ugh, I'm really sorry, I completely forgot about this.
I rebased, fixed the conflicts and updated the tests to recognize the new anchors, but I'm afraid I don't have the capacity right now to get back into this much beyond that.
It'll take at least several weeks for me to be available to take this up again.
You can take this up and continue without me if you'd like to, or wait for me to have some time free up for it.

Again, sorry for the holdup.

stephenfin · 2024-02-26T10:26:46Z

@TomerGodinger No issues. There's no panic with this so I'm happy to wait.

stephenfin · 2024-05-14T12:44:54Z

Closing this for now. If you're able to get back to this, please feel free to reopen.

sravel · 2024-12-04T07:51:33Z

@TomerGodinger or somewone can implemented this good features?

TomerGodinger · 2024-12-05T16:24:21Z

OK, I realized that I'm probably never going to get to dive back into this, so I did enough to at least get it to a reasonable state.
I rebased on the current master branch, fixed conflicts, updated the tests, fixed the short/full nesting discrepancy that @lorenzo-cavazzi pointed out, and added documentation for the new things.

@stephenfin I don't know how to reopen this PR, so I'd appreciate your guidance there. I actually don't know how to get it to sync the new changes, either. The branch I made in my fork already has them, but I don't see them here.
I can open a new PR if preferable.

I'm sure more can and should be added here (perhaps more tests), but I don't know if and when I'll get to that.
It's a bit of a problem for me to actually run this on my system right now.
If someone wants to add some, I can at least take a look at them.

I'll try to pay more attention to this until we're done with it, but I have a pretty high load nowadays so it's problematic. I had a bit of downtime today so I wanted to make this workable again at least. Only took me two years. 😅

stephenfin · 2024-12-06T16:41:39Z

@stephenfin I don't know how to reopen this PR, so I'd appreciate your guidance there. I actually don't know how to get it to sync the new changes, either. The branch I made in my fork already has them, but I don't see them here.
I can open a new PR if preferable.

I think you probably want to open a new PR at this point. You can link it back here. I'll do my best to review it sooner rather than later, so we can finally get this closed off!

TomerGodinger · 2024-12-08T07:22:10Z

^ Done.

stephenfin requested changes Apr 14, 2022

View reviewed changes

stephenfin requested changes May 26, 2022

View reviewed changes

sphinx_click/ext.py Outdated Show resolved Hide resolved

sphinx_click/ext.py Outdated Show resolved Hide resolved

sphinx_click/ext.py Outdated Show resolved Hide resolved

sphinx_click/ext.py Outdated Show resolved Hide resolved

stephenfin mentioned this pull request Jun 26, 2022

Nested subcommands improvement #107

Open

stephenfin force-pushed the new-features branch 2 times, most recently from 28410f5 to 2701ed4 Compare June 28, 2022 15:54

lorenzo-cavazzi mentioned this pull request Aug 3, 2022

docs: add command line full reference using sphinx-click SwissDataScienceCenter/renku-python#3065

Merged

lorenzo-cavazzi reviewed Aug 5, 2022

View reviewed changes

TomerGodinger added 4 commits February 20, 2024 17:28

Make tests take new anchors into account

88816ba

TomerGodinger force-pushed the new-features branch from d11a908 to 88816ba Compare February 20, 2024 17:05

stephenfin closed this May 14, 2024

bittremieux mentioned this pull request Jul 4, 2024

CLI documentation page generation Noble-Lab/casanovo#342

Merged

TomerGodinger changed the title ~~More anchors + new features (WIP): :hide-header:, :nested: complete, :post-process:~~ More anchors + new features (long overdue): :hide-header:, :nested: complete, :post-process: Dec 5, 2024

TomerGodinger mentioned this pull request Dec 8, 2024

More anchors + new features: :hide-header:, :nested: complete, :post-process: #147

Open

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

More anchors + new features (long overdue): :hide-header:, :nested: complete, :post-process: #100

More anchors + new features (long overdue): :hide-header:, :nested: complete, :post-process: #100

TomerGodinger commented Apr 14, 2022

stephenfin left a comment •

edited

Loading

stephenfin Apr 14, 2022

TomerGodinger Apr 17, 2022

TomerGodinger commented Apr 17, 2022

TomerGodinger commented Apr 18, 2022

TomerGodinger commented May 24, 2022

stephenfin left a comment

TomerGodinger commented Jun 1, 2022

stephenfin commented Jun 26, 2022

stephenfin commented Jun 28, 2022

TomerGodinger commented Jul 13, 2022

lorenzo-cavazzi left a comment

lorenzo-cavazzi Aug 5, 2022 •

edited

Loading

sravel commented Feb 17, 2023

sravel commented Feb 6, 2024

stephenfin commented Feb 12, 2024

TomerGodinger commented Feb 20, 2024

stephenfin commented Feb 26, 2024

stephenfin commented May 14, 2024

sravel commented Dec 4, 2024

TomerGodinger commented Dec 5, 2024

stephenfin commented Dec 6, 2024

TomerGodinger commented Dec 8, 2024

More anchors + new features (long overdue): :hide-header:, :nested: complete, :post-process: #100

More anchors + new features (long overdue): :hide-header:, :nested: complete, :post-process: #100

Conversation

TomerGodinger commented Apr 14, 2022

stephenfin left a comment • edited Loading

Choose a reason for hiding this comment

stephenfin Apr 14, 2022

Choose a reason for hiding this comment

TomerGodinger Apr 17, 2022

Choose a reason for hiding this comment

TomerGodinger commented Apr 17, 2022

TomerGodinger commented Apr 18, 2022

TomerGodinger commented May 24, 2022

stephenfin left a comment

Choose a reason for hiding this comment

TomerGodinger commented Jun 1, 2022

stephenfin commented Jun 26, 2022

stephenfin commented Jun 28, 2022

TomerGodinger commented Jul 13, 2022

lorenzo-cavazzi left a comment

Choose a reason for hiding this comment

lorenzo-cavazzi Aug 5, 2022 • edited Loading

Choose a reason for hiding this comment

sravel commented Feb 17, 2023

sravel commented Feb 6, 2024

stephenfin commented Feb 12, 2024

TomerGodinger commented Feb 20, 2024

stephenfin commented Feb 26, 2024

stephenfin commented May 14, 2024

sravel commented Dec 4, 2024

TomerGodinger commented Dec 5, 2024

stephenfin commented Dec 6, 2024

TomerGodinger commented Dec 8, 2024

stephenfin left a comment •

edited

Loading

lorenzo-cavazzi Aug 5, 2022 •

edited

Loading