Skip to content

Commit

Permalink
Add section to usage docs (#19)
Browse files Browse the repository at this point in the history
  • Loading branch information
FasterSpeeding authored Dec 7, 2022
1 parent fb9f229 commit 56d6f4a
Show file tree
Hide file tree
Showing 4 changed files with 250 additions and 4 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
### Added
- Support for Sphinx style reST docs to doc parse.
- Optional `name` argument to [tanchan.docs_parse.as_slash_command][] which
- Optional `name` argument to [tanchan.doc_parse.as_slash_command][] which
allows overriding the command's name.

### Fixed
- [tanchan.doc_parse.as_slash_command][] no-longer errors when the callback's
docstring is just the description and `doc_style` is [None][].
- [tanjun.doc_parse.with_annotated_args][] now allows [None][] to be explicitly
- [tanchan.doc_parse.with_annotated_args][] now allows [None][] to be explicitly
passed to `doc_style` typing wise.

## [0.1.0] - 2022-12-02
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ python -m pip install -U tanchan

# Quick Usage

For usage see the [documentation](https://tanchan.cursed.solutions/).
For usage see the [documentation](https://tanchan.cursed.solutions/) and the
[usage guide](https://tanchan.cursed.solutions/usage/).

# Support

Expand Down
92 changes: 91 additions & 1 deletion docs/usage.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,93 @@
# Usage

Coming soon.
## Doc parse

[tanchan.doc_parse][] exposes two methods which help with declaring slash commands:

```py
import tanjun
from tanchan import doc_parse

# This command will show up as "meow" in the command menu
@doc_parse.as_slash_command()
async def meow(ctx: tanjun.abc.SlashContext) -> None:
"""Meow command's description."""
...

get_group = tanjun.slash_command_group("get", "Get command group")

# This command will show up as "get user" in the command menu
@get_group.with_command
@doc_parse.as_slash_command()
async def user(ctx: tanjun.abc.SlashContext) -> None:
"""Get a user."""
...
```

[tanchan.doc_parse.as_slash_command][] acts as an extension to [tanjun.as_slash_command][]
which uses the function's name as the command's name and the first line of its docstring
as the command's description.


```py
import typing

import tanjun
from tanchan import doc_parse
from tanjun import annotations

# Google's doc style.
@doc_parse.with_annotated_args
@doc_parse.as_slash_command()
async def ban(
ctx: tanjun.abc.SlashContext,
user: annotations.User,
reason: typing.Optional[annotations.Length[460]] = None,
) -> None:
"""Ban a user from this guild.
Args:
user: The user to ban from this guild.
reason: The reason for the ban.
If not provided then a generic reason will be used.
"""

# NumPy's doc style.
@doc_parse.with_annotated_args
@doc_parse.as_slash_command()
async def kick(
ctx: tanjun.abc.SlashContext,
member: annotations.Member,
reason: typing.Optional[annotations.Length[460]] = None,
) -> None:
"""Kick a member from this guild.
Parameters
----------
member
The guild member to kick.
reason
The reason for the kick.
If not provided then a generic reason will be used.
"""

# Sphinx's "reST" doc style.
@doc_parse.with_annotated_args
@doc_parse.as_slash_command()
async def echo(
ctx: tanjun.abc.SlashContext,
content: annotations.Str,
channel: typing.Optional[annotations.Channel] = None,
) -> None:
"""Make the bot echo a message.
:param content: The message to echo.
:param channel: The channel to echo to.
If not provided then the current channel will be targeted.
"""
```


[tanchan.doc_parse.with_annotated_args][] uses the functionality exposed in [tanjun.annotations][]
but with the added feature that slash command option descriptions are parsed from the docstring.
This supports Google's doc style, NumPy's doc style, and Sphinx's "reST" doc style.
155 changes: 155 additions & 0 deletions tests/test_usage_guilde.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
# -*- coding: utf-8 -*-
# BSD 3-Clause License
#
# Copyright (c) 2022, Faster Speeding
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# * Redistributions of source code must retain the above copyright notice, this
# list of conditions and the following disclaimer.
#
# * Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
#
# * Neither the name of the copyright holder nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


def test_doc_prase_as_slash_command():
import tanjun

from tanchan import doc_parse

# This command will show up as "meow" in the command menu
@doc_parse.as_slash_command()
async def meow(ctx: tanjun.abc.SlashContext) -> None:
"""Meow command's description."""
...

get_group = tanjun.slash_command_group("get", "Get command group")

# This command will show up as "get user" in the command menu
@get_group.with_command
@doc_parse.as_slash_command()
async def user(ctx: tanjun.abc.SlashContext) -> None:
"""Get a user."""
...

build = meow.build()

assert meow.name == build.name == "meow"
assert meow.description == build.description == "Meow command's description."
assert len(build.options) == 0

build = user.build()
assert user.name == build.name == "user"
assert user.description == build.description == "Get a user."
assert len(build.options) == 0
assert user in get_group.commands


def test_doc_parse_with_annotated_args():
import typing

import tanjun
from tanjun import annotations

from tanchan import doc_parse

# Google's doc style.
@doc_parse.with_annotated_args
@doc_parse.as_slash_command()
async def ban(
ctx: tanjun.abc.SlashContext, user: annotations.User, reason: typing.Optional[annotations.Length[460]] = None
) -> None:
"""Ban a user from this guild.
Args:
user: The user to ban from this guild.
reason: The reason for the ban.
If not provided then a generic reason will be used.
""" # noqa: D407

# NumPy's doc style.
@doc_parse.with_annotated_args
@doc_parse.as_slash_command()
async def kick(
ctx: tanjun.abc.SlashContext,
member: annotations.Member,
reason: typing.Optional[annotations.Length[460]] = None,
) -> None:
"""Kick a member from this guild.
Parameters
----------
member
The guild member to kick.
reason
The reason for the kick.
If not provided then a generic reason will be used.
"""

# Sphinx's "reST" doc style.
@doc_parse.with_annotated_args
@doc_parse.as_slash_command()
async def echo(
ctx: tanjun.abc.SlashContext, content: annotations.Str, channel: typing.Optional[annotations.Channel] = None
) -> None:
"""Make the bot echo a message.
:param content: The message to echo.
:param channel: The channel to echo to.
If not provided then the current channel will be targeted.
"""

build = ban.build()

assert ban.name == build.name == "ban"
assert ban.description == build.description == "Ban a user from this guild."
assert len(build.options) == 2
assert build.options[0].name == "user"
assert build.options[0].description == "The user to ban from this guild."
assert build.options[1].name == "reason"
assert build.options[1].description == (
"The reason for the ban. If not provided then a generic reason will be used."
)

build = kick.build()

assert kick.name == build.name == "kick"
assert kick.description == build.description == "Kick a member from this guild."
assert len(build.options) == 2
assert build.options[0].name == "member"
assert build.options[0].description == "The guild member to kick."
assert build.options[1].name == "reason"
assert build.options[1].description == (
"The reason for the kick. If not provided then a generic reason will be used."
)

build = echo.build()

assert echo.name == build.name == "echo"
assert echo.description == build.description == "Make the bot echo a message."
assert len(build.options) == 2
assert build.options[0].name == "content"
assert build.options[0].description == "The message to echo."
assert build.options[1].name == "channel"
assert (
build.options[1].description
== "The channel to echo to. If not provided then the current channel will be targeted."
)

0 comments on commit 56d6f4a

Please sign in to comment.